Merge branch 'master' into fix/issue-45

Author: weiznich

.github/workflows/ci.yml

@@ -56,6 +56,9 @@ jobs:
         if: runner.os == 'macOS' && matrix.backend == 'postgres'
         run: |
           brew update
+          brew uninstall --ignore-dependencies libpq
+          brew install postgres
+          /usr/local/Cellar/postgresql/12.2/bin/initdb --locale=C -E UTF-8 /usr/local/var/postgres
           /usr/local/opt/postgres/bin/pg_ctl -D /usr/local/var/postgres start
           sleep 3
           /usr/local/opt/postgres/bin/createuser -s postgres

wundergraph/src/query_builder/selection/filter/transformator/default.rs

@@ -375,24 +375,24 @@ where
         Self::Table: 'static,
     {
         use juniper::LookAheadMethods;
-        if let Some(LookAheadValue::List(order)) =
-            select.argument("order").map(LookAheadArgument::value)
-        {
-            let order_stmts = <Self::Columns as BuildOrder<Self::Table, DB>>::build_order(
-                order,
-                |local_index| {
-                    Self::FieldList::map_table_field(local_index, |global| {
-                        Self::FIELD_NAMES[global]
-                    })
-                    .expect("Field is there")
-                },
-            )?;
-            for s in order_stmts {
-                query = query.then_order_by(s);
+        match select.argument("order").map(LookAheadArgument::value) {
+            Some(LookAheadValue::List(order)) => {
+                let order_stmts = <Self::Columns as BuildOrder<Self::Table, DB>>::build_order(
+                    order,
+                    |local_index| {
+                        Self::FieldList::map_table_field(local_index, |global| {
+                            Self::FIELD_NAMES[global]
+                        })
+                        .expect("Field is there")
+                    },
+                )?;
+                for s in order_stmts {
+                    query = query.then_order_by(s);
+                }
+                Ok(query)
             }
-            Ok(query)
-        } else {
-            Ok(query)
+            Some(_) => Err(WundergraphError::CouldNotBuildFilterArgument),
+            None => Ok(query),
         }
     }
 

wundergraph/src/query_builder/selection/filter/transformator/exclusive.rs

@@ -86,3 +86,43 @@ fn order_desc() {
 ]"###
     );
 }
+
+#[test]
+fn invalid_order() {
+    let (schema, pool) = get_example_schema();
+    let ctx = MyContext::new(pool.get().unwrap());
+
+    let res = execute_query(
+        &schema,
+        &ctx,
+        "
+{
+    Heros(order: {column: heroName, direction: DESC}) {
+        heroName
+    }
+}
+",
+    );
+    assert!(res.is_ok());
+    assert_json_snapshot!(
+        res.as_json(), @r###"
+    [
+      null,
+      [
+        {
+          "locations": [
+            {
+              "column": 5,
+              "line": 3
+            }
+          ],
+          "message": "Could not build filter from arguments",
+          "path": [
+            "Heros"
+          ]
+        }
+      ]
+    ]
+    "###
+    );
+}