Skip to content

Commit 15d49a8

Browse files
update tests
1 parent 9ac52a2 commit 15d49a8

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

QueryBuilder.Tests/SelectTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void Union()
175175

176176
var c = Compile(mobiles);
177177

178-
Assert.Equal("SELECT * FROM [Phones] UNION (SELECT * FROM [Laptops])", c[EngineCodes.SqlServer]);
178+
Assert.Equal("SELECT * FROM [Phones] UNION SELECT * FROM [Laptops]", c[EngineCodes.SqlServer]);
179179

180180

181181
Assert.Equal("SELECT * FROM \"PHONES\" UNION SELECT * FROM \"LAPTOPS\"", c[EngineCodes.Firebird]);
@@ -190,8 +190,8 @@ public void UnionWithBindings()
190190

191191
var c = Compile(mobiles);
192192

193-
Assert.Equal("SELECT * FROM [Phones] UNION (SELECT * FROM [Laptops] WHERE [Type] = 'A')", c[EngineCodes.SqlServer]);
194-
Assert.Equal("SELECT * FROM `Phones` UNION (SELECT * FROM `Laptops` WHERE `Type` = 'A')", c[EngineCodes.MySql]);
193+
Assert.Equal("SELECT * FROM [Phones] UNION SELECT * FROM [Laptops] WHERE [Type] = 'A'", c[EngineCodes.SqlServer]);
194+
Assert.Equal("SELECT * FROM `Phones` UNION SELECT * FROM `Laptops` WHERE `Type` = 'A'", c[EngineCodes.MySql]);
195195

196196
Assert.Equal("SELECT * FROM \"PHONES\" UNION SELECT * FROM \"LAPTOPS\" WHERE \"TYPE\" = 'A'", c[EngineCodes.Firebird]);
197197
}
@@ -203,8 +203,8 @@ public void RawUnionWithBindings()
203203

204204
var c = Compile(mobiles);
205205

206-
Assert.Equal("SELECT * FROM [Phones] UNION (SELECT * FROM [Laptops] WHERE [Type] = 'A')", c[EngineCodes.SqlServer]);
207-
Assert.Equal("SELECT * FROM `Phones` UNION (SELECT * FROM `Laptops` WHERE `Type` = 'A')", c[EngineCodes.MySql]);
206+
Assert.Equal("SELECT * FROM [Phones] UNION SELECT * FROM [Laptops] WHERE [Type] = 'A'", c[EngineCodes.SqlServer]);
207+
Assert.Equal("SELECT * FROM `Phones` UNION SELECT * FROM `Laptops` WHERE `Type` = 'A'", c[EngineCodes.MySql]);
208208
}
209209

210210
[Fact]
@@ -217,7 +217,7 @@ public void MultipleUnion()
217217

218218
var c = Compile(mobiles);
219219

220-
Assert.Equal("SELECT * FROM [Phones] UNION (SELECT * FROM [Laptops]) UNION (SELECT * FROM [Tablets])",
220+
Assert.Equal("SELECT * FROM [Phones] UNION SELECT * FROM [Laptops] UNION SELECT * FROM [Tablets]",
221221
c[EngineCodes.SqlServer]);
222222

223223

@@ -236,7 +236,7 @@ public void MultipleUnionWithBindings()
236236
var c = Compile(mobiles);
237237

238238
Assert.Equal(
239-
"SELECT * FROM [Phones] WHERE [Price] < 3000 UNION (SELECT * FROM [Laptops] WHERE [Price] > 1000) UNION (SELECT * FROM [Tablets] WHERE [Price] > 2000)",
239+
"SELECT * FROM [Phones] WHERE [Price] < 3000 UNION SELECT * FROM [Laptops] WHERE [Price] > 1000 UNION SELECT * FROM [Tablets] WHERE [Price] > 2000",
240240
c[EngineCodes.SqlServer]);
241241

242242

@@ -257,7 +257,7 @@ public void MultipleUnionWithBindingsAndPagination()
257257
var c = Compile(mobiles);
258258

259259
Assert.Equal(
260-
"SELECT * FROM [Phones] WHERE [Price] < 3000 UNION (SELECT * FROM [Laptops] WHERE [Price] > 1000) UNION ALL (SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS [row_num] FROM [Tablets] WHERE [Price] > 2000) AS [results_wrapper] WHERE [row_num] BETWEEN 16 AND 30)",
260+
"SELECT * FROM [Phones] WHERE [Price] < 3000 UNION SELECT * FROM [Laptops] WHERE [Price] > 1000 UNION ALL SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS [row_num] FROM [Tablets] WHERE [Price] > 2000) AS [results_wrapper] WHERE [row_num] BETWEEN 16 AND 30",
261261
c[EngineCodes.SqlServer]);
262262

263263

@@ -277,7 +277,7 @@ public void UnionWithCallbacks()
277277
var c = Compile(mobiles);
278278

279279
Assert.Equal(
280-
"SELECT * FROM [Phones] WHERE [Price] < 3000 UNION (SELECT * FROM [Laptops]) UNION ALL (SELECT * FROM [Tablets])",
280+
"SELECT * FROM [Phones] WHERE [Price] < 3000 UNION SELECT * FROM [Laptops] UNION ALL SELECT * FROM [Tablets]",
281281
c[EngineCodes.SqlServer]);
282282

283283

@@ -300,15 +300,15 @@ public void UnionWithDifferentEngine()
300300
var c = Compile(mobiles);
301301

302302
Assert.Equal(
303-
"SELECT * FROM [Phones] WHERE [Price] < 300 EXCEPT (SELECT * FROM [Phones] WHERE NOT ([Os] = 'iOS')) UNION ALL (SELECT * FROM [Tablets] WHERE [Price] < 100)",
303+
"SELECT * FROM [Phones] WHERE [Price] < 300 EXCEPT SELECT * FROM [Phones] WHERE NOT ([Os] = 'iOS') UNION ALL SELECT * FROM [Tablets] WHERE [Price] < 100",
304304
c[EngineCodes.SqlServer]);
305305

306306
Assert.Equal(
307-
"SELECT * FROM `Phones` WHERE `Price` < 300 INTERSECT ALL (SELECT * FROM `Watches` WHERE `Os` = 'Android') UNION ALL (SELECT * FROM `Tablets` WHERE `Price` < 100)",
307+
"SELECT * FROM `Phones` WHERE `Price` < 300 INTERSECT ALL SELECT * FROM `Watches` WHERE `Os` = 'Android' UNION ALL SELECT * FROM `Tablets` WHERE `Price` < 100",
308308
c[EngineCodes.MySql]);
309309

310310
Assert.Equal(
311-
"SELECT * FROM \"Phones\" WHERE \"Price\" < 300 UNION (SELECT * FROM \"Laptops\" WHERE \"Price\" < 800) UNION ALL (SELECT * FROM \"Tablets\" WHERE \"Price\" < 100)",
311+
"SELECT * FROM \"Phones\" WHERE \"Price\" < 300 UNION SELECT * FROM \"Laptops\" WHERE \"Price\" < 800 UNION ALL SELECT * FROM \"Tablets\" WHERE \"Price\" < 100",
312312
c[EngineCodes.PostgreSql]);
313313

314314
Assert.Equal(

0 commit comments

Comments
 (0)