fix: filtering of sub-queries (#53)

https://github.com/orgs/synthql/projects/1/views/1?pane=issue&itemId=81880173
synthql · Oct 2, 2024 · a851857 · a851857
1 parent cb8934d
commit a851857
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 23 deletions.
diff --git a/packages/backend/src/execution/executors/PgExecutor/queryBuilder/compareJoins.test.ts b/packages/backend/src/execution/executors/PgExecutor/queryBuilder/compareJoins.test.ts
@@ -19,6 +19,7 @@ describe('compareJoins', () => {
                         otherColumn: store.column('manager_id'),
                     },
                 ],
+                where: {},
             },
             {
                 table: pet,
@@ -29,6 +30,7 @@ describe('compareJoins', () => {
                         otherColumn: person.column('id'),
                     },
                 ],
+                where: {},
             },
             {
                 table: pet,
@@ -39,6 +41,7 @@ describe('compareJoins', () => {
                         otherColumn: person.column('id'),
                     },
                 ],
+                where: {},
             },
         ];
 

diff --git a/packages/backend/src/execution/executors/PgExecutor/queryBuilder/createAugmentedQuery.ts b/packages/backend/src/execution/executors/PgExecutor/queryBuilder/createAugmentedQuery.ts
@@ -63,6 +63,10 @@ function collectJoins(query: AnyQuery, defaultSchema: string): Array<Join> {
             },
         );
 
+        const whereExceptRefOps: Where<AnyDB, string> = Object.fromEntries(
+            Object.entries(query.where).filter(([_, refOp]) => !isRefOp(refOp)),
+        );
+
         if (conditions.length === 0) {
             return [];
         }
@@ -71,6 +75,7 @@ function collectJoins(query: AnyQuery, defaultSchema: string): Array<Join> {
             {
                 table: TableRef.fromQuery(defaultSchema, query),
                 conditions,
+                where: whereExceptRefOps,
             },
         ];
     });
@@ -80,12 +85,7 @@ function collectWhere(
     query: AnyQuery,
     defaultSchema: string,
 ): Array<{ table: TableRef; where: Where<AnyDB, string> }> {
-    return collectFromQuery(query, (query) => {
-        return [
-            {
-                table: TableRef.fromQuery(defaultSchema, query),
-                where: query.where,
-            },
-        ];
-    });
+    return [
+        { table: TableRef.fromQuery(defaultSchema, query), where: query.where },
+    ];
 }
diff --git a/packages/backend/src/execution/executors/PgExecutor/queryBuilder/exp.ts b/packages/backend/src/execution/executors/PgExecutor/queryBuilder/exp.ts
@@ -358,24 +358,32 @@ export class SqlBuilder {
     leftJoin(join: Join) {
         const table = join.table;
 
+        const where = new SqlBuilder().expressionFromWhere({
+            table,
+            where: join.where,
+        });
+
         return this.add('left join ')
             .add(table.canonical())
             .space()
             .add(table.aliasQuoted())
             .add(' on ')
             .addInterleaved(
-                join.conditions.map((cond) => {
-                    const own = cond.ownColumn.aliasQuoted();
-                    const other = cond.otherColumn.aliasQuoted();
-                    const op = cond.op;
-                    return new SqlBuilder()
-                        .add(own)
-                        .space()
-                        .add(op)
-                        .space()
-                        .add(other)
-                        .space();
-                }),
+                [
+                    ...join.conditions.map((cond) => {
+                        const own = cond.ownColumn.aliasQuoted();
+                        const other = cond.otherColumn.aliasQuoted();
+                        const op = cond.op;
+                        return new SqlBuilder()
+                            .add(own)
+                            .space()
+                            .add(op)
+                            .space()
+                            .add(other)
+                            .space();
+                    }),
+                    where,
+                ].filter((b) => !b.isEmpty()),
                 SqlBuilder.and(),
             );
     }

diff --git a/packages/backend/src/execution/executors/PgExecutor/queryBuilder/types.ts b/packages/backend/src/execution/executors/PgExecutor/queryBuilder/types.ts
@@ -1,7 +1,7 @@
 import { SqlBuilder } from './exp';
 import { TableRef } from '../../../../refs/TableRef';
 import { ColumnRef } from '../../../../refs/ColumnRef';
-import { JoinOp } from '@synthql/queries';
+import { AnyQuery, JoinOp, Where } from '@synthql/queries';
 
 export interface Selection {
     extractFromRow(row: any, target: any): void;
@@ -15,4 +15,5 @@ export type Join = {
         otherColumn: ColumnRef;
         op: JoinOp;
     }>;
+    where: AnyQuery['where'];
 };
diff --git a/packages/backend/src/tests/e2e/select.test.ts b/packages/backend/src/tests/e2e/select.test.ts
@@ -203,4 +203,20 @@ describe('select', () => {
             ),
         ).toEqual(resultNonDeferred);
     });
+
+    test('join with where', async () => {
+        const language = from('language')
+            .columns('name')
+            .where({
+                language_id: col('film.language_id'),
+                name: 'Fake language',
+            })
+            .all();
+
+        const query = from('film').columns('title').include({ language }).all();
+
+        const result = await run(query);
+
+        expect(result.flatMap((r) => r.language)).toEqual([]);
+    });
 });
diff --git a/packages/docs/static/reference/assets/navigation.js b/packages/docs/static/reference/assets/navigation.js