wip

packages/backend/src/execution/execute.test.ts

@@ -1,8 +1,8 @@
-import { col, query } from '@synthql/queries';
+import { query } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { collectLast } from '..';
 import { QueryProvider } from '../QueryProvider';
-import { DB, schema } from '../tests/generated';
+import { DB, ref, schema } from '../tests/generated';
 import { PgCatalogInt4, PgCatalogText } from '../tests/generated/db';
 import { execute } from './execute';
 import { QueryProviderExecutor } from './executors/QueryProviderExecutor';
@@ -238,7 +238,7 @@ describe('execute', () => {
                 .include({
                     rating: from('film_rating')
                         .columns('rating')
-                        .where({ film_id: col('film.film_id') })
+                        .where({ film_id: ref('film.film_id') })
                         .one(),
                 })
                 .one();

packages/backend/src/execution/executors/PgExecutor/PgExecutor.test.ts

@@ -1,7 +1,6 @@
-import { col } from '@synthql/queries';
 import { describe, expect, it } from 'vitest';
 import { PgExecutor } from '.';
-import { from } from '../../../tests/generated';
+import { col, from } from '../../../tests/generated';
 import { pool } from '../../../tests/queryEngine';
 import { QueryProviderExecutor } from '../QueryProviderExecutor';
 

packages/backend/src/execution/executors/PgExecutor/canExecute.test.ts

@@ -1,6 +1,6 @@
-import { col } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { PgExecutor } from '.';
+import { col } from '../../../tests/generated';
 import {
     actor,
     film,

packages/backend/src/execution/executors/QueryProviderExecutor/convertWhereToQueryProviderInput.test.ts

@@ -1,5 +1,6 @@
-import { col } from '@synthql/queries';
+import {} from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
+import { col } from '../../../tests/generated';
 import { convertWhereToQueryProviderInput } from './convertWhereToQueryProviderInput';
 
 describe('convertWhereToQueryProviderInput', () => {
@@ -52,8 +53,8 @@ describe('convertWhereToQueryProviderInput', () => {
         { a: { match: 'a%' } },
         { a: { ilike: 'a%' } },
         { a: 1, b: { not: 2 } },
-        { a: col<any>('b.a') },
-        { a: col<any>('b.a'), b: 2 },
+        { a: col('b.a' as never) },
+        { a: col('b.a' as never), b: 2 },
     ];
 
     describe('unsupported where clauses', () => {

packages/backend/src/execution/planning/createPlanningQuery.test.ts

@@ -1,6 +1,5 @@
-import { col } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
-import { from } from '../../tests/generated';
+import { col, from } from '../../tests/generated';
 import { store } from '../../tests/queries.v2';
 import { printPath } from '../../util/path/printPath';
 import { PlanningQuery } from '../types';

packages/backend/src/query/collectColumnReferences.test.ts

@@ -1,6 +1,6 @@
-import { AnyQuery, QueryResult, col } from '@synthql/queries';
+import { AnyQuery, QueryResult } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
-import { from } from '../tests/generated';
+import { col, from } from '../tests/generated';
 import { city } from '../tests/queries.v2';
 import { collectColumnReferences } from './collectColumnReferences';
 

packages/backend/src/query/iterateQuery.test.ts

@@ -1,7 +1,7 @@
-import { AnyQuery, col } from '@synthql/queries';
+import { AnyQuery } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { Path } from '../execution/types';
-import { from } from '../tests/generated';
+import { col, from } from '../tests/generated';
 import { iterateQuery } from './iterateQuery';
 
 describe('iterateQuery', () => {

packages/backend/src/query/iterateResultRow.test.ts

@@ -1,5 +1,6 @@
-import { QueryResult, col } from '@synthql/queries';
+import { QueryResult } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
+import { col } from '../tests/generated';
 import { city } from '../tests/queries.v2';
 import { iterateResultRows } from './iterateResultRow';
 

packages/backend/src/query/resolveReferences.test.ts

@@ -1,9 +1,8 @@
 import { describe, expect, test } from 'vitest';
-import { col } from '@synthql/queries';
-import { createRefContext } from '../refs/RefContext';
 import { ColumnRef } from '../refs/ColumnRef';
+import { createRefContext } from '../refs/RefContext';
+import { col, from } from '../tests/generated';
 import { resolveReferences } from './resolveReferences';
-import { from } from '../tests/generated';
 
 describe('resolveReferences', () => {
     test('should resolve references', async () => {

packages/backend/src/tests/benchmarks/bench.test.ts

@@ -1,10 +1,9 @@
-import { col } from '@synthql/queries';
 import Benchmark from 'benchmark';
 import fs from 'fs';
 import path from 'path';
 import { describe, test } from 'vitest';
 import { collectLast } from '../..';
-import { from } from '../generated';
+import { col, from } from '../generated';
 import { queryEngine } from '../queryEngine';
 
 describe('Benchmark tests', () => {

packages/backend/src/tests/e2e/defer.test.ts

@@ -0,0 +1,19 @@
+import { describe, test } from 'vitest';
+import { col } from '../generated';
+import { from } from '../queries';
+
+describe('defer', () => {
+    test('top level defer', async () => {
+        const language = from('language')
+            .columns('name')
+            .defer()
+            .where({
+                language_id: col('film.film_id'),
+            })
+            .all();
+
+        from('film').columns('film_id').include({
+            language,
+        });
+    });
+});

packages/backend/src/tests/e2e/nx1.test.ts

@@ -1,9 +1,9 @@
-import { Where, col } from '@synthql/queries';
+import { Where } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { collectLast } from '../..';
 import { execute } from '../../execution/execute';
 import { QueryProviderExecutor } from '../../execution/executors/QueryProviderExecutor';
-import { DB, from } from '../generated';
+import { col, DB, from } from '../generated';
 import { provideFilm } from '../provideFilm';
 import { provideLanguage } from '../provideLanguage';
 

packages/backend/src/tests/e2e/nxm.test.ts

@@ -1,4 +1,4 @@
-import { col } from '@synthql/queries';
+import {} from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { collectLast } from '../..';
 import { execute } from '../../execution/execute';
@@ -7,7 +7,7 @@ import { createExecutionPlan } from '../../execution/planning/createExecutionPla
 import { simplifyPlan } from '../../execution/planning/simplifyPlan';
 import { describeQuery } from '../../query/describeQuery';
 import { compareInventory } from '../compareInventory';
-import { from } from '../generated';
+import { col, from } from '../generated';
 
 import { sql } from '../postgres';
 import { pool } from '../queryEngine';

packages/backend/src/tests/e2e/select.test.ts

@@ -1,6 +1,7 @@
-import { Query, col } from '@synthql/queries';
+import { Query } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { collectLast } from '../..';
+import { col } from '../generated';
 import { sql } from '../postgres';
 import { findActorById, findCityById, from, movie } from '../queries';
 import { queryEngine } from '../queryEngine';

packages/backend/src/tests/e2e/store-with-customers.test.ts

@@ -1,11 +1,11 @@
-import { QueryResult, col } from '@synthql/queries';
+import { QueryResult } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { collectLast } from '../..';
 import { execute } from '../../execution/execute';
 import { PgExecutor } from '../../execution/executors/PgExecutor';
 import { describeQuery } from '../../query/describeQuery';
 import { assertPresent } from '../../util/asserts/assertPresent';
-import { from } from '../generated';
+import { col, from } from '../generated';
 import { sql } from '../postgres';
 import { store } from '../queries.v2';
 import { pool } from '../queryEngine';

packages/backend/src/tests/e2e/store-with-films.test.ts

@@ -1,11 +1,12 @@
-import { QueryResult, col } from '@synthql/queries';
+import { QueryResult } from '@synthql/queries';
 import { describe, expect, test } from 'vitest';
 import { collectLast } from '../..';
 import { execute } from '../../execution/execute';
 import { PgExecutor } from '../../execution/executors/PgExecutor';
 import { describeQuery } from '../../query/describeQuery';
 import { assertPresent } from '../../util/asserts/assertPresent';
 import { compareInventory } from '../compareInventory';
+import { col } from '../generated';
 import { sql } from '../postgres';
 import { from } from '../queries';
 import { actor, filmActor } from '../queries.v2';

packages/backend/src/tests/generated/index.ts

@@ -4,4 +4,4 @@ import { DB } from './db';
 import { schema } from './schema';
 export type { DB } from './db';
 export { schema } from './schema';
-export const from = query<DB>(schema).from;
+export const { from, ref, col } = query<DB>(schema);

packages/backend/src/tests/queries.ts

@@ -1,5 +1,5 @@
-import { Table, WhereClause, col, query } from '@synthql/queries';
-import { DB, schema } from './generated';
+import { Table, WhereClause, query } from '@synthql/queries';
+import { DB, col, schema } from './generated';
 
 export function from<TTable extends Table<DB>>(table: TTable) {
     return query<DB>(schema).from(table);

packages/backend/src/tests/queries.v2.ts

@@ -1,5 +1,4 @@
-import { col } from '@synthql/queries';
-import { from } from './generated';
+import { col, from } from './generated';
 
 export function language() {
     return from('language').columns('name', 'language_id');

packages/backend/src/types/QueryProviderInput.ts

@@ -1,4 +1,4 @@
-import { Table, ColumnValue } from '@synthql/queries';
+import { ColumnValue, Table } from '@synthql/queries';
 
 /**
  * Get all the `whereable` columns in a table and return

packages/cli/src/types/CliConfig.ts

@@ -1,4 +1,5 @@
 import { ColumnDefProperties } from '@synthql/queries';
+
 export interface CliConfig {
     /**
      * Internal. DO NOT USE/SET this option.

packages/cli/src/validators/createTableDefTransformers.ts

@@ -1,11 +1,11 @@
 import { ColumnDefProperties } from '@synthql/queries';
-import { SchemaDefOverrides } from '../types/CliConfig';
 import {
     TableColumn,
     TableDetails,
     ViewColumn,
     ViewDetails,
 } from 'extract-pg-schema';
+import { SchemaDefOverrides } from '../types/CliConfig';
 
 interface TableDefTransformer {
     test: (tableDetails: TableDetails | ViewDetails) => boolean;