Fix tests involving .take and .drop for MS SQL

com-lihaoyi · Sep 10, 2024 · c2dba92 · c2dba92
1 parent 9530c47
commit c2dba92
Show file tree

Hide file tree

Showing 4 changed files with 289 additions and 114 deletions.
diff --git a/scalasql/test/src/query/FlatJoinTests.scala b/scalasql/test/src/query/FlatJoinTests.scala
@@ -267,22 +267,42 @@ trait FlatJoinTests extends ScalaSqlSuite {
           si <- ShippingInfo.select.sortBy(_.id).asc.take(1).crossJoin()
         } yield (b.name, si.shippingDate)
       },
-      sql = """
-        SELECT
-          subquery0.name AS res_0,
-          subquery1.shipping_date AS res_1
-        FROM
-          (SELECT buyer0.id AS id, buyer0.name AS name
-          FROM buyer buyer0
-          ORDER BY id ASC
-          LIMIT ?) subquery0
-        CROSS JOIN (SELECT
-            shipping_info1.id AS id,
-            shipping_info1.shipping_date AS shipping_date
-          FROM shipping_info shipping_info1
-          ORDER BY id ASC
-          LIMIT ?) subquery1
-      """,
+      sqls = Seq(
+        """
+          SELECT
+            subquery0.name AS res_0,
+            subquery1.shipping_date AS res_1
+          FROM
+            (SELECT buyer0.id AS id, buyer0.name AS name
+            FROM buyer buyer0
+            ORDER BY id ASC
+            LIMIT ?) subquery0
+          CROSS JOIN (SELECT
+              shipping_info1.id AS id,
+              shipping_info1.shipping_date AS shipping_date
+            FROM shipping_info shipping_info1
+            ORDER BY id ASC
+            LIMIT ?) subquery1
+        """,
+        """
+          SELECT
+            subquery0.name AS res_0,
+            subquery1.shipping_date AS res_1
+          FROM
+            (SELECT buyer0.id AS id, buyer0.name AS name
+            FROM buyer buyer0
+            ORDER BY id ASC
+            OFFSET ? ROWS
+            FETCH FIRST ? ROWS ONLY) subquery0
+          CROSS JOIN (SELECT
+              shipping_info1.id AS id,
+              shipping_info1.shipping_date AS shipping_date
+            FROM shipping_info shipping_info1
+            ORDER BY id ASC
+            OFFSET ? ROWS
+            FETCH FIRST ? ROWS ONLY) subquery1
+        """
+      ),
       value = Seq(
         ("James Bond", LocalDate.parse("2010-02-03"))
       ),

diff --git a/scalasql/test/src/query/SelectTests.scala b/scalasql/test/src/query/SelectTests.scala
@@ -236,15 +236,28 @@ trait SelectTests extends ScalaSqlSuite {
           )
         )
       },
-      sql = """
-        SELECT
-          product0.name AS res_0,
-          (SELECT purchase1.total AS res
-            FROM purchase purchase1
-            WHERE (purchase1.product_id = product0.id)
-            ORDER BY res DESC
-            LIMIT ?) AS res_1
-        FROM product product0""",
+      sqls = Seq(
+        """
+          SELECT
+            product0.name AS res_0,
+            (SELECT purchase1.total AS res
+              FROM purchase purchase1
+              WHERE (purchase1.product_id = product0.id)
+              ORDER BY res DESC
+              LIMIT ?) AS res_1
+          FROM product product0
+        """,
+        """
+          SELECT
+            product0.name AS res_0,
+            (SELECT purchase1.total AS res
+              FROM purchase purchase1
+              WHERE (purchase1.product_id = product0.id)
+              ORDER BY res DESC
+              OFFSET ? ROWS FETCH FIRST ? ROWS ONLY) AS res_1
+          FROM product product0
+        """
+      ),
       value = Seq(
         ("Face Mask", 888.0),
         ("Guitar", 900.0),