revert: #2617 (#2664)

Author: max-sixty

bindings/prql-elixir/test/prql_test.exs

@@ -27,7 +27,7 @@ defmodule PRQLTest do
             "code": null,
             "reason": "Unknown name invalid",
             "hint": null,
-            "span": "1:0-7",
+            "span": "span-chars-0-7",
             "display": "Error: \n   ╭─[:1:1]\n   │\n 1 │ invalid\n   │ ───┬───  \n   │    ╰───── Unknown name invalid\n───╯\n",
             "location": {
               "start": [0, 0],

bindings/prql-python/python/tests/conftest.py

@@ -0,0 +1,13 @@
+import pytest
+
+import yaml
+
+
+@pytest.fixture()
+def example_queries():
+    website_path = "../../web/website/content/_index.md"
+    with open(website_path, "r") as f:
+        website = f.read()
+    website_yaml = yaml.safe_load(website.replace("---", ""))
+    showcase_section = website_yaml["showcase_section"]["examples"]
+    return showcase_section

bindings/prql-python/python/tests/test_website_queries.py

@@ -1,18 +1,6 @@
 import re
 
 import prql_python as prql
-import pytest
-import yaml
-
-
-@pytest.fixture()
-def example_queries():
-    website_path = "../../web/website/content/_index.md"
-    with open(website_path, "r") as f:
-        website = f.read()
-    website_yaml = yaml.safe_load(website.replace("---", ""))
-    showcase_section = website_yaml["showcase_section"]["examples"]
-    return showcase_section
 
 
 def normalize(sql: str) -> str:
@@ -30,5 +18,5 @@ def test_all_examples(example_queries):
         compiled_normalized = normalize(compiled)
         truth_normalized = normalize(query["sql"])
         assert (
-            compiled_normalized == truth_normalized
+            truth_normalized == compiled_normalized
         ), f"Failed on Query ID: '{query['id']}'"

prql-compiler/src/sql/dialect.rs

@@ -202,10 +202,6 @@ pub(super) trait DialectHandler: Any + Debug {
             right: Box::new(target),
         })
     }
-
-    fn nulls_first(&self) -> Option<bool> {
-        Some(false)
-    }
 }
 
 impl dyn DialectHandler {
@@ -283,11 +279,6 @@ impl DialectHandler for MsSqlDialect {
     fn set_ops_distinct(&self) -> bool {
         false
     }
-
-    fn nulls_first(&self) -> Option<bool> {
-        // Unsupported for MSSQL
-        None
-    }
 }
 
 impl DialectHandler for MySqlDialect {
@@ -311,11 +302,6 @@ impl DialectHandler for MySqlDialect {
             sql_ast::BinaryOperator::Custom("REGEXP".to_string()),
         )
     }
-
-    fn nulls_first(&self) -> Option<bool> {
-        // Unsupported for MySQL
-        None
-    }
 }
 
 impl DialectHandler for ClickHouseDialect {
@@ -381,11 +367,6 @@ impl DialectHandler for DuckDbDialect {
     ) -> anyhow::Result<sql_ast::Expr> {
         self.translate_regex_with_function(search, target, "REGEXP_MATCHES")
     }
-
-    fn nulls_first(&self) -> Option<bool> {
-        // `NULLS LAST` is default for DuckDB
-        None
-    }
 }
 
 #[cfg(test)]

prql-compiler/src/sql/gen_expr.rs

@@ -719,7 +719,7 @@ pub(super) fn translate_column_sort(
         } else {
             Some(false)
         },
-        nulls_first: ctx.dialect.nulls_first(),
+        nulls_first: None,
     })
 }
 

prql-compiler/src/tests/test.rs

@@ -675,9 +675,9 @@ fn test_sorts() {
     FROM
       invoices
     ORDER BY
-      issued_at NULLS LAST,
-      amount DESC NULLS LAST,
-      num_of_articles NULLS LAST
+      issued_at,
+      amount DESC,
+      num_of_articles
     "###);
 
     assert_display_snapshot!((compile(r###"
@@ -699,7 +699,7 @@ fn test_sorts() {
     FROM
       table_1 AS table_0
     ORDER BY
-      _expr_0 NULLS LAST
+      _expr_0
     "###);
 }
 
@@ -865,16 +865,16 @@ fn test_window_functions_02() {
       SUM(num_books) OVER (
         PARTITION BY order_month
         ORDER BY
-          order_day NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
+          order_day ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
       ) AS running_total_num_books,
       LAG(num_books, 7) OVER (
         ORDER BY
-          order_day NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
+          order_day ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS num_books_last_week
     FROM
       table_1 AS table_0
     ORDER BY
-      order_day NULLS LAST
+      order_day
     "###);
 }
 
@@ -933,7 +933,7 @@ fn test_window_functions_05() {
       RANK() OVER (
         PARTITION BY month
         ORDER BY
-          num_orders NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
+          num_orders ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
       ),
       LAG(num_orders, 7) OVER () AS num_orders_last_week
     FROM
@@ -1024,12 +1024,12 @@ fn test_window_functions_10() {
       *,
       SUM(b) OVER (
         ORDER BY
-          day NULLS LAST RANGE BETWEEN 4 PRECEDING AND 4 FOLLOWING
+          day RANGE BETWEEN 4 PRECEDING AND 4 FOLLOWING
       ) AS next_four_days
     FROM
       foo
     ORDER BY
-      day NULLS LAST
+      day
     "###);
 
     // TODO: add test for preceding
@@ -1258,7 +1258,7 @@ fn test_take() {
     FROM
       table_1 AS table_0
     ORDER BY
-      name NULLS LAST
+      name
     LIMIT
       5
     "###);
@@ -1423,7 +1423,7 @@ fn test_distinct() {
         ROW_NUMBER() OVER (
           PARTITION BY department
           ORDER BY
-            salary NULLS LAST
+            salary
         ) AS _expr_0
       FROM
         employees
@@ -1446,7 +1446,7 @@ fn test_distinct() {
         ROW_NUMBER() OVER (
           PARTITION BY department
           ORDER BY
-            salary NULLS LAST
+            salary
         ) AS _expr_0
       FROM
         employees
@@ -1483,7 +1483,7 @@ fn test_distinct() {
     WHERE
       _expr_0 <= 1
     ORDER BY
-      billing_city NULLS LAST
+      billing_city
     "###);
 }
 
@@ -1634,7 +1634,7 @@ fn test_sql_of_ast_1() {
       title,
       country
     ORDER BY
-      title NULLS LAST
+      title
     LIMIT
       20
     "###
@@ -1895,7 +1895,7 @@ take 20
     HAVING
       COUNT(*) > 200
     ORDER BY
-      sum_gross_cost NULLS LAST
+      sum_gross_cost
     LIMIT
       20
     "###);
@@ -1931,7 +1931,7 @@ fn test_prql_to_sql_table() {
       FROM
         employees
       ORDER BY
-        tenure NULLS LAST
+        tenure
       LIMIT
         50
     ), average_salaries AS (
@@ -1951,7 +1951,7 @@ fn test_prql_to_sql_table() {
       newest_employees
       JOIN average_salaries ON newest_employees.country = average_salaries.country
     ORDER BY
-      employees.tenure NULLS LAST
+      employees.tenure
     "###
     );
 }
@@ -2009,7 +2009,7 @@ fn test_nonatomic() {
       title,
       country
     ORDER BY
-      sum_gross_cost NULLS LAST
+      sum_gross_cost
     "###);
 
     // A aggregate, then sort and filter
@@ -2037,7 +2037,7 @@ fn test_nonatomic() {
     HAVING
       AVG(salary) > 0
     ORDER BY
-      sum_gross_cost NULLS LAST
+      sum_gross_cost
     "###);
 }
 
@@ -3127,7 +3127,7 @@ fn test_custom_transforms() {
     FROM
       tab
     ORDER BY
-      name NULLS LAST
+      name
     LIMIT
       3
     "###
@@ -3574,7 +3574,7 @@ fn test_excess_columns() {
     FROM
       table_1 AS table_0
     ORDER BY
-      _expr_0 NULLS LAST
+      _expr_0
     "###
     );
 }

prql-compiler/tests/integration/snapshots/[email protected]

@@ -11,7 +11,7 @@ WITH table_1 AS (
   FROM
     tracks
   ORDER BY
-    bytes DESC NULLS LAST
+    bytes DESC
   LIMIT
     20
 )
@@ -21,5 +21,5 @@ SELECT
 FROM
   table_1 AS table_0
 ORDER BY
-  bytes DESC NULLS LAST
+  bytes DESC
 

prql-compiler/tests/integration/snapshots/[email protected]

@@ -16,6 +16,6 @@ SELECT
 FROM
   table_1 AS table_0
 ORDER BY
-  album_id NULLS LAST,
-  genre_id NULLS LAST
+  album_id,
+  genre_id
 

prql-compiler/tests/integration/snapshots/integration__sql@group_all.prql.snap

@@ -23,5 +23,5 @@ GROUP BY
   table_0.album_id,
   table_0.title
 ORDER BY
-  table_0.album_id NULLS LAST
+  table_0.album_id
 

prql-compiler/tests/integration/snapshots/integration__sql@group_sort.prql.snap

@@ -20,7 +20,7 @@ table_2 AS (
   FROM
     table_3 AS table_0
   ORDER BY
-    _expr_0 NULLS LAST
+    _expr_0
   LIMIT
     10
 )
@@ -30,5 +30,5 @@ SELECT
 FROM
   table_2 AS table_1
 ORDER BY
-  _expr_0 NULLS LAST
+  _expr_0
 

prql-compiler/tests/integration/snapshots/integration__sql@invoice_totals.prql.snap

@@ -24,16 +24,16 @@ SELECT
   SUM(num_tracks) OVER (
     PARTITION BY city
     ORDER BY
-      street NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
+      street ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
   ) AS running_total_num_tracks,
   LAG(num_tracks, 7) OVER (
     ORDER BY
-      city NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
+      city ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
   ) AS num_tracks_last_week
 FROM
   table_1 AS table_0
 ORDER BY
-  city NULLS LAST
+  city
 LIMIT
   20
 

prql-compiler/tests/integration/snapshots/[email protected]

@@ -14,7 +14,7 @@ WITH table_1 AS (
     REGEXP(name, 'Love')
     AND milliseconds / 1000 / 60 BETWEEN 3 AND 4
   ORDER BY
-    track_id NULLS LAST
+    track_id
   LIMIT
     15
 )
@@ -24,5 +24,5 @@ SELECT
 FROM
   table_1 AS table_0
 ORDER BY
-  track_id NULLS LAST
+  track_id
 

prql-compiler/tests/integration/snapshots/[email protected]

@@ -21,6 +21,6 @@ FROM
   table_1 AS table_0
   LEFT JOIN employees AS manager ON table_0.reports_to = manager.employee_id
 ORDER BY
-  table_0.first_name NULLS LAST,
-  table_0.last_name NULLS LAST
+  table_0.first_name,
+  table_0.last_name
 

prql-compiler/tests/integration/snapshots/[email protected]

@@ -14,7 +14,7 @@ WITH table_1 AS (
   FROM
     tracks
   ORDER BY
-    milliseconds NULLS LAST
+    milliseconds
   LIMIT
     10
 )
@@ -23,5 +23,5 @@ SELECT
 FROM
   table_1 AS table_0
 ORDER BY
-  milliseconds NULLS LAST
+  milliseconds