Skip to content

Commit c2dba92

Browse files
committed
Fix tests involving .take and .drop for MS SQL
1 parent 9530c47 commit c2dba92

File tree

4 files changed

+289
-114
lines changed

4 files changed

+289
-114
lines changed

scalasql/test/src/query/FlatJoinTests.scala

+36-16
Original file line numberDiff line numberDiff line change
@@ -267,22 +267,42 @@ trait FlatJoinTests extends ScalaSqlSuite {
267267
si <- ShippingInfo.select.sortBy(_.id).asc.take(1).crossJoin()
268268
} yield (b.name, si.shippingDate)
269269
},
270-
sql = """
271-
SELECT
272-
subquery0.name AS res_0,
273-
subquery1.shipping_date AS res_1
274-
FROM
275-
(SELECT buyer0.id AS id, buyer0.name AS name
276-
FROM buyer buyer0
277-
ORDER BY id ASC
278-
LIMIT ?) subquery0
279-
CROSS JOIN (SELECT
280-
shipping_info1.id AS id,
281-
shipping_info1.shipping_date AS shipping_date
282-
FROM shipping_info shipping_info1
283-
ORDER BY id ASC
284-
LIMIT ?) subquery1
285-
""",
270+
sqls = Seq(
271+
"""
272+
SELECT
273+
subquery0.name AS res_0,
274+
subquery1.shipping_date AS res_1
275+
FROM
276+
(SELECT buyer0.id AS id, buyer0.name AS name
277+
FROM buyer buyer0
278+
ORDER BY id ASC
279+
LIMIT ?) subquery0
280+
CROSS JOIN (SELECT
281+
shipping_info1.id AS id,
282+
shipping_info1.shipping_date AS shipping_date
283+
FROM shipping_info shipping_info1
284+
ORDER BY id ASC
285+
LIMIT ?) subquery1
286+
""",
287+
"""
288+
SELECT
289+
subquery0.name AS res_0,
290+
subquery1.shipping_date AS res_1
291+
FROM
292+
(SELECT buyer0.id AS id, buyer0.name AS name
293+
FROM buyer buyer0
294+
ORDER BY id ASC
295+
OFFSET ? ROWS
296+
FETCH FIRST ? ROWS ONLY) subquery0
297+
CROSS JOIN (SELECT
298+
shipping_info1.id AS id,
299+
shipping_info1.shipping_date AS shipping_date
300+
FROM shipping_info shipping_info1
301+
ORDER BY id ASC
302+
OFFSET ? ROWS
303+
FETCH FIRST ? ROWS ONLY) subquery1
304+
"""
305+
),
286306
value = Seq(
287307
("James Bond", LocalDate.parse("2010-02-03"))
288308
),

scalasql/test/src/query/SelectTests.scala

+22-9
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,28 @@ trait SelectTests extends ScalaSqlSuite {
236236
)
237237
)
238238
},
239-
sql = """
240-
SELECT
241-
product0.name AS res_0,
242-
(SELECT purchase1.total AS res
243-
FROM purchase purchase1
244-
WHERE (purchase1.product_id = product0.id)
245-
ORDER BY res DESC
246-
LIMIT ?) AS res_1
247-
FROM product product0""",
239+
sqls = Seq(
240+
"""
241+
SELECT
242+
product0.name AS res_0,
243+
(SELECT purchase1.total AS res
244+
FROM purchase purchase1
245+
WHERE (purchase1.product_id = product0.id)
246+
ORDER BY res DESC
247+
LIMIT ?) AS res_1
248+
FROM product product0
249+
""",
250+
"""
251+
SELECT
252+
product0.name AS res_0,
253+
(SELECT purchase1.total AS res
254+
FROM purchase purchase1
255+
WHERE (purchase1.product_id = product0.id)
256+
ORDER BY res DESC
257+
OFFSET ? ROWS FETCH FIRST ? ROWS ONLY) AS res_1
258+
FROM product product0
259+
"""
260+
),
248261
value = Seq(
249262
("Face Mask", 888.0),
250263
("Guitar", 900.0),

0 commit comments

Comments
 (0)