Merge remote-tracking branch 'origin/main' into divi/config-server-ci…

…-branch

ci/deploy.sh

@@ -44,28 +44,22 @@ function run {
 # Assumes that the given ref is a branch name. Sets a tag for a docker image of
 # the form:
 #
-#                dev-main-20230601T1933-bffd555
-#                --- ---- ------------- -------
-#                ↑   ↑         ↑           ↑
-#     prefix "dev"   branch    |        commit hash
-#                              |
-#                    commit date & time (UTC)
+#                dev-main-bffd555
+#                --- ---- -------
+#                ↑   ↑       ↑
+#     prefix "dev"   |      commit hash
+#                  branch
 #
 # Additionally sets a branch tag assuming this is the latest tag for the given
 # branch. The branch tag has the form: dev-main
 function set_dev_tags {
     local branch="$1"
-    # replace '/' in branch name with '-'
+    # replace '.' and '/' in branch name with '-'
     local tidy_branch
-    tidy_branch="$(echo "${branch}" | tr "//" -)"
-    local branch_prefix="dev-$tidy_branch"
+    tidy_branch="$(tr './' '-' <<< "$branch")"
+    local branch_prefix="dev-${tidy_branch}"
     local version
-    version=$(
-        TZ=UTC0 git show \
-            --quiet \
-            --date='format-local:%Y%m%dT%H%M' \
-            --format="$branch_prefix-%cd-%h"
-    )
+    version=$(git show --quiet --format="${branch_prefix}-%h")
     export docker_tags=("$version" "$branch_prefix")
 }
 

crates/connectors/ndc-citus/tests/query_tests.rs

@@ -108,18 +108,6 @@ mod predicates {
         insta::assert_json_snapshot!(result);
     }
 
-    #[tokio::test]
-    async fn select_where_name_similar() {
-        let result = run_query(create_router().await, "select_where_name_similar").await;
-        insta::assert_json_snapshot!(result);
-    }
-
-    #[tokio::test]
-    async fn select_where_name_nsimilar() {
-        let result = run_query(create_router().await, "select_where_name_nsimilar").await;
-        insta::assert_json_snapshot!(result);
-    }
-
     #[tokio::test]
     async fn select_where_name_regex() {
         let result = run_query(create_router().await, "select_where_name_regex").await;
@@ -244,6 +232,37 @@ mod sorting {
         .await;
         insta::assert_json_snapshot!(result);
     }
+    #[tokio::test]
+    async fn sorting_by_nested_relationship_column_with_predicate() {
+        let result = run_query(
+            create_router().await,
+            "sorting_by_nested_relationship_column_with_predicate",
+        )
+        .await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    // Citus sorts strings differently than PostgreSQL,
+    // so the 5th row might be different.
+    #[tokio::test]
+    async fn sorting_by_nested_relationship_column_with_predicate_exists() {
+        let result = run_query(
+            create_router().await,
+            "sorting_by_nested_relationship_column_with_predicate_exists",
+        )
+        .await;
+        insta::assert_json_snapshot!(result);
+    }
+
+    #[tokio::test]
+    async fn sorting_by_relationship_count_with_predicate() {
+        let result = run_query(
+            create_router().await,
+            "sorting_by_relationship_count_with_predicate",
+        )
+        .await;
+        insta::assert_json_snapshot!(result);
+    }
 }
 
 mod aggregation {

crates/connectors/ndc-citus/tests/snapshots/explain_tests__select_where_name_nilike.snap

@@ -20,7 +20,7 @@ FROM
             FROM
               "public"."Album" AS "%0_Album"
             WHERE
-              ("%0_Album"."Title" NOT ILIKE cast($1 as varchar))
+              ("%0_Album"."Title" !~~* cast($1 as varchar))
             ORDER BY
               "%0_Album"."AlbumId" ASC
             LIMIT

crates/connectors/ndc-citus/tests/snapshots/explain_tests__select_where_variable.snap

@@ -20,7 +20,7 @@ FROM
             FROM
               "public"."Album" AS "%0_Album"
             WHERE
-              ("%0_Album"."Title" LIKE $1)
+              ("%0_Album"."Title" ~~ $1)
             ORDER BY
               "%0_Album"."AlbumId" ASC
           ) AS "%2_rows"

crates/connectors/ndc-citus/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap

@@ -0,0 +1,16 @@
+---
+source: crates/connectors/ndc-citus/tests/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "Name": "Crazy Train"
+      },
+      {
+        "Name": "I Don't Know"
+      }
+    ]
+  }
+]

crates/connectors/ndc-citus/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap

@@ -0,0 +1,25 @@
+---
+source: crates/connectors/ndc-citus/tests/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "Name": "Balls to the Wall"
+      },
+      {
+        "Name": "Fast As a Shark"
+      },
+      {
+        "Name": "Princess of the Dawn"
+      },
+      {
+        "Name": "Restless and Wild"
+      },
+      {
+        "Name": "\"?\""
+      }
+    ]
+  }
+]

crates/connectors/ndc-citus/tests/snapshots/query_tests__sorting__sorting_by_relationship_count_with_predicate.snap

@@ -0,0 +1,25 @@
+---
+source: crates/connectors/ndc-citus/tests/query_tests.rs
+expression: result
+---
+[
+  {
+    "rows": [
+      {
+        "Name": "Iron Maiden"
+      },
+      {
+        "Name": "Metallica"
+      },
+      {
+        "Name": "U2"
+      },
+      {
+        "Name": "Led Zeppelin"
+      },
+      {
+        "Name": "Deep Purple"
+      }
+    ]
+  }
+]