fix filtering on relationships

hasura · Jan 16, 2025 · dbc3b2b · dbc3b2b
1 parent de643e5
commit dbc3b2b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # DuckDB Connector Changelog
 This changelog documents changes between release tags.
 
+## [0.1.7] - 2025-01-15
+* Fix filtering across relationships
+
 ## [0.1.6] - 2025-01-15
 * Fix github workflow
 

diff --git a/connector-definition/connector-metadata.yaml b/connector-definition/connector-metadata.yaml
@@ -1,13 +1,13 @@
 packagingDefinition:
   type: PrebuiltDockerImage
-  dockerImage: ghcr.io/hasura/ndc-duckdb:v0.1.6
+  dockerImage: ghcr.io/hasura/ndc-duckdb:v0.1.7
 supportedEnvironmentVariables:
   - name: DUCKDB_URL
     description: The url for the DuckDB database
 commands:
   update:
     type: Dockerized
-    dockerImage: ghcr.io/hasura/ndc-duckdb:v0.1.6
+    dockerImage: ghcr.io/hasura/ndc-duckdb:v0.1.7
     commandArgs:
       - update
 dockerComposeWatch:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "duckdb-sdk",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/src/handlers/query.ts b/src/handlers/query.ts
@@ -308,7 +308,7 @@ function build_where(
         subquery_sql = `
           SELECT 1
           FROM ${from_collection_alias} AS ${escape_double(subquery_alias)}
-          WHERE ${predicate ? build_where(predicate, collection_relationships, args, variables, prefix, collection_aliases, config, query_request) : '1 = 1'}
+          WHERE ${predicate ? build_where(predicate, collection_relationships, args, variables, subquery_alias, collection_aliases, config, query_request) : '1 = 1'}
           AND ${Object.entries(relationship.column_mapping).map(([from, to]) => {
             return `${escape_double(prefix)}.${escape_double(from)} = ${escape_double(subquery_alias)}.${escape_double(to)}`;
           }).join(" AND ")}
@@ -594,7 +594,6 @@ export async function do_query(
   state: State,
   query: QueryRequest
 ): Promise<QueryResponse> {
-  // console.log(JSON.stringify(query, null, 4));
   let query_plans = await plan_queries(configuration, query);
   return await perform_query(state, query_plans);
 }