@technicity/data-service-generator 0.11.6 → 0.11.7-next.0

package/README.md

@@ -22,7 +22,7 @@ async function main() {
     dialect: "mysql",
     database: "MY_DATABASE",
     user: "MY_USER",
-    password: "MY_PASSWORD",
+    password: "MY_PASSWORD"
   });
 }
 ```
@@ -36,7 +36,7 @@ async function main() {
 | Option        | Required | Default      | Description                                                     |
 | ------------- | -------- | ------------ | --------------------------------------------------------------- |
 | outdir        | Yes      |              | The output directory for the SDK.                               |
-| dialect       | Yes      |              | "mysql" \| "mssql"                                              |
+| dialect       | Yes      |              | "mysql" \|                                                      |
 | database      | Yes      |              | Database name                                                   |
 | user          | Yes      |              | Database user                                                   |
 | password      | No       |              | Database password                                               |
@@ -47,7 +47,9 @@ async function main() {
 
 ### Running Tests
 
+- `pyenv shell 3.11` (workaround for `node-sqlite`/`node-gyp` error)
+
 - spin up test environment: `docker-compose up -d`
 - run tests: `docker-compose exec test yarn test`
 
-- `yarn test:prepare`
+- `yarn test:prepare`

package/dist/generation/generate.d.ts

@@ -1,7 +1,7 @@
 import type { IDialect, ISupplementClientOpts } from "../runtime/IRuntime";
-declare type ISpecialCaseUuidColumn = boolean;
-declare type IIncludeMappedFields = boolean;
-declare type IGenerateInput = {
+type ISpecialCaseUuidColumn = boolean;
+type IIncludeMappedFields = boolean;
+type IGenerateInput = {
     dialect: IDialect;
     database: string;
     user: string;

package/dist/generation/generate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
+exports.generate = generate;
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
@@ -10,9 +10,6 @@ const changeCase = require("change-case");
 const fse = require("fs-extra");
 const _ = require("lodash/fp");
 const uuid_1 = require("uuid");
-const mssql = require("mssql");
-// @ts-ignore
-const TSqlString = require("tsqlstring");
 const json_schema_to_typescript_1 = require("json-schema-to-typescript");
 const getDuplicates_1 = require("../lib/getDuplicates");
 const isNotNullOrUndefined_1 = require("../lib/isNotNullOrUndefined");
@@ -136,7 +133,6 @@ async function generate(input) {
     fse.copySync(tmpBuildOutputPath, sdkOutputPath);
     fse.removeSync(tmpDirPath);
 }
-exports.generate = generate;
 function init(input) {
     const { database, user, password, host, port, server } = input;
     if (dialect === "mysql") {
@@ -149,24 +145,6 @@ function init(input) {
         });
         query = mysql.query.bind(mysql);
     }
-    if (dialect === "mssql" || dialect === "ksql") {
-        const pool = new mssql.ConnectionPool({
-            server: server ?? "localhost",
-            user,
-            password,
-            port,
-            database
-        });
-        const poolConnect = pool.connect();
-        async function runMSSQLQuery(...input) {
-            const q = TSqlString.format(...input);
-            await poolConnect;
-            const request = pool.request();
-            const result = await request.query(q);
-            return result.recordset;
-        }
-        query = runMSSQLQuery;
-    }
 }
 // It's a bit awkward to put __whereNeedsProcessing, __prepareWhere on the class,
 // but it allows us to share the same database pool, clientOpts, etc.
@@ -1254,12 +1232,11 @@ async function getJunctionTables() {
 }
 // `from` relations
 // https://stackoverflow.com/a/54732547
-// Memoize because it seems to be expensive for MSSQL. Note: this function
+// Note: this function
 // isn't pure (because of `dialect`), but that's fine because its value
 // isn't expected to change.
 const getRelationsManyToOne = _.memoize(async function getRelationsManyToOne(table) {
-    const sql = dialect === "mysql"
-        ? `
+    const sql = `
   SELECT
     TABLE_SCHEMA as db,
     TABLE_NAME as t1,
@@ -1273,26 +1250,7 @@ const getRelationsManyToOne = _.memoize(async function getRelationsManyToOne(tab
     TABLE_SCHEMA = SCHEMA()
     AND REFERENCED_TABLE_NAME IS NOT NULL
     AND (TABLE_NAME = ?);
-  `
-        : // https://stackoverflow.com/a/3907999
-            `
-  SELECT
-    KCU1.TABLE_NAME AS t1
-    ,KCU1.COLUMN_NAME AS t1Field
-    ,KCU2.TABLE_NAME AS t2
-    ,KCU2.COLUMN_NAME AS t2Field
-  FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS RC
-  INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU1
-    ON KCU1.CONSTRAINT_CATALOG = RC.CONSTRAINT_CATALOG
-    AND KCU1.CONSTRAINT_SCHEMA = RC.CONSTRAINT_SCHEMA
-    AND KCU1.CONSTRAINT_NAME = RC.CONSTRAINT_NAME
-  INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU2
-    ON KCU2.CONSTRAINT_CATALOG = RC.UNIQUE_CONSTRAINT_CATALOG
-    AND KCU2.CONSTRAINT_SCHEMA = RC.UNIQUE_CONSTRAINT_SCHEMA
-    AND KCU2.CONSTRAINT_NAME = RC.UNIQUE_CONSTRAINT_NAME
-    AND KCU2.ORDINAL_POSITION = KCU1.ORDINAL_POSITION
-  WHERE
-    KCU1.TABLE_NAME = ?`;
+  `;
     const tableMeta = await getTableMeta(table);
     const rs = await query(sql, [table]);
     const xs = await Promise.all(_.uniqWith(_.isEqual, rs.map(async (v) => {
@@ -1308,8 +1266,7 @@ const getRelationsManyToOne = _.memoize(async function getRelationsManyToOne(tab
 });
 // `to` relations
 const getRelationsOneToMany = _.memoize(async function getRelationsOneToMany(table) {
-    const sql = dialect === "mysql"
-        ? `
+    const sql = `
   SELECT
     TABLE_SCHEMA as db,
     TABLE_NAME as t1,
@@ -1323,25 +1280,7 @@ const getRelationsOneToMany = _.memoize(async function getRelationsOneToMany(tab
     TABLE_SCHEMA = SCHEMA()
     AND REFERENCED_TABLE_NAME IS NOT NULL
     AND (REFERENCED_TABLE_NAME = ?);
-  `
-        : `
-  SELECT
-    KCU1.TABLE_NAME AS t1
-    ,KCU1.COLUMN_NAME AS t1Field
-    ,KCU2.TABLE_NAME AS t2
-    ,KCU2.COLUMN_NAME AS t2Field
-  FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS RC
-  INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU1
-    ON KCU1.CONSTRAINT_CATALOG = RC.CONSTRAINT_CATALOG
-    AND KCU1.CONSTRAINT_SCHEMA = RC.CONSTRAINT_SCHEMA
-    AND KCU1.CONSTRAINT_NAME = RC.CONSTRAINT_NAME
-  INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU2
-    ON KCU2.CONSTRAINT_CATALOG = RC.UNIQUE_CONSTRAINT_CATALOG
-    AND KCU2.CONSTRAINT_SCHEMA = RC.UNIQUE_CONSTRAINT_SCHEMA
-    AND KCU2.CONSTRAINT_NAME = RC.UNIQUE_CONSTRAINT_NAME
-    AND KCU2.ORDINAL_POSITION = KCU1.ORDINAL_POSITION
-  WHERE
-    KCU2.TABLE_NAME = ?`;
+  `;
     const rs = await query(sql, [table]);
     const xs = await Promise.all(_.uniqWith(_.isEqual, rs.map(async (v) => {
         return {
@@ -1396,47 +1335,6 @@ const getTableMeta = _.memoize(async function getTableMeta(table) {
     if (dialect === "mysql") {
         return query("DESCRIBE ??", [table]).then((xs) => _.sortBy((x) => x.Field, xs));
     }
-    if (dialect === "mssql" || dialect === "ksql") {
-        const primaryColumn = await query(`SELECT columns.name as COLUMN_NAME
-          FROM sys.tables tables
-          JOIN sys.columns columns
-          ON tables.object_id=columns.object_id
-          WHERE columns.is_identity=1 AND tables.name = ?`, [table]).then((xs) => xs[0]?.["COLUMN_NAME"]);
-        const uniqueColumns = 
-        // https://stackoverflow.com/a/59095477
-        await query(`SELECT c.name AS COLUMN_NAME
-       FROM sys.indexes i
-          INNER JOIN sys.index_columns ic
-             ON i.index_id = ic.index_id AND i.object_id = ic.object_id
-          INNER JOIN sys.tables AS t 
-             ON t.object_id = i.object_id
-          INNER JOIN sys.columns c
-             ON t.object_id = c.object_id AND ic.column_id = c.column_id
-          INNER JOIN sys.objects AS syso 
-             ON syso.object_id = t.object_id AND syso.is_ms_shipped = 0 
-          INNER JOIN sys.schemas AS sh
-             ON sh.schema_id = t.schema_id 
-          INNER JOIN information_schema.schemata sch
-             ON sch.schema_name = sh.name
-       WHERE i.is_unique_constraint = 1
-          AND t.name = ?
-          -- AND sh.name = 'dbo'
-       ORDER BY sh.name, i.name, ic.key_ordinal;`, [table]).then((xs) => xs.map((x) => x["COLUMN_NAME"]));
-        return query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ? ORDER BY ORDINAL_POSITION", [table]).then((xs) => _.sortBy((x) => x.Field, xs.map((x) => {
-            const Field = x["COLUMN_NAME"];
-            return {
-                Field,
-                Type: x["DATA_TYPE"],
-                Key: Field === primaryColumn
-                    ? "PRI"
-                    : uniqueColumns.find((u) => u === Field)
-                        ? "UNI"
-                        : "",
-                Null: x["IS_NULLABLE"],
-                Default: x["COLUMN_DEFAULT"]
-            };
-        })));
-    }
     throw new Error("Unsupported dialect: " + dialect);
 });
 function getJSONSchemaObjProperties(tableMeta) {
@@ -1580,23 +1478,9 @@ function getPropertyFormat(sqlType) {
     }
     return undefined;
 }
-const mssqlTableExcludes = new Set([
-    "captured_columns",
-    "change_tables",
-    "ddl_history",
-    "index_columns",
-    "lsn_time_mapping",
-    "systranschemas"
-]);
 async function getTableNames() {
     if (dialect === "mysql") {
         return query("SHOW TABLES").then((xs) => xs.flatMap((x) => Object.values(x)).sort());
     }
-    if (dialect === "mssql" || dialect === "ksql") {
-        return query("SELECT * FROM INFORMATION_SCHEMA.TABLES").then((xs) => xs
-            .map((x) => x["TABLE_NAME"])
-            .filter((x) => !x.startsWith("dbo_") && !mssqlTableExcludes.has(x))
-            .sort());
-    }
     throw new Error("Unsupported dialect: " + dialect);
 }

package/dist/lib/getDuplicates.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDuplicates = void 0;
+exports.getDuplicates = getDuplicates;
 function getDuplicates(arr) {
     return arr.reduce((agg, col) => {
         agg.filter[col] = agg.filter[col] ? agg.dup.push(col) : 2;
         return agg;
     }, { filter: {}, dup: [] }).dup;
 }
-exports.getDuplicates = getDuplicates;

package/dist/lib/isNotNullOrUndefined.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotNullOrUndefined = void 0;
+exports.isNotNullOrUndefined = isNotNullOrUndefined;
 // https://github.com/Microsoft/TypeScript/issues/16069
 function isNotNullOrUndefined(input) {
     return input != null;
 }
-exports.isNotNullOrUndefined = isNotNullOrUndefined;

package/dist/runtime/Cache.d.ts

@@ -1,7 +1,7 @@
 import Redis, { Cluster } from "ioredis";
 import { TResolveParams } from "./IRuntime";
 import Stats from "./Stats";
-export declare type RedisConfig = {
+export type RedisConfig = {
     host: string;
     port: number;
     tls?: boolean;

package/dist/runtime/IRuntime.d.ts

@@ -9,7 +9,7 @@ export interface IRuntime {
         isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE";
     }): Promise<TBeginTransactionResult>;
 }
-export declare type TResolveParams = {
+export type TResolveParams = {
     resource: string;
     action: "findUnique" | "findMany" | "findManyPaginated" | "create" | "update" | "updateMany" | "delete" | "deleteMany";
     args?: IArgs | undefined;
@@ -20,55 +20,55 @@ export declare type TResolveParams = {
     skipCache?: boolean;
     dbCall?: TDbCall;
 };
-export declare type TContext = {
+export type TContext = {
     [k: string]: any;
 };
-export declare type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
-export declare type IDialect = "mysql" | "mssql" | "ksql";
-export declare type TDbCall = (q: string) => Promise<any>;
-export declare type TFormatQuery = (q: string, values: any[]) => string;
-export declare type TBeginTransaction = () => Promise<TBeginTransactionResult>;
-declare type TBeginTransactionResult = {
+export type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
+export type IDialect = "mysql";
+export type TDbCall = (q: string) => Promise<any>;
+export type TFormatQuery = (q: string, values: any[]) => string;
+export type TBeginTransaction = () => Promise<TBeginTransactionResult>;
+type TBeginTransactionResult = {
     dbCall: (q: string) => Promise<any>;
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
 };
-export declare type ISupplementClientOpts = boolean;
-export declare type IOrderBy = {
+export type ISupplementClientOpts = boolean;
+export type IOrderBy = {
     column: string;
     direction: any;
 }[];
-export declare type IArgs = {
+export type IArgs = {
     [k: string]: any;
 };
-export declare type IField = string | {
+export type IField = string | {
     name: string;
     as?: string;
     fields: IField[];
     args?: IArgs;
     transform?: (record: any) => any;
 };
-declare type IWhere = (table: string, args: IArgs) => string | undefined;
-declare type IASTChildColumn = {
+type IWhere = (table: string, args: IArgs) => string | undefined;
+type IASTChildColumn = {
     type: "column";
     name: string;
     fieldName: string;
     as: string;
     fromOtherTable?: string | undefined;
 };
-declare type IASTChildComposite = {
+type IASTChildComposite = {
     type: "composite";
     name: string[];
     fieldName: string;
     as: string;
     fromOtherTable?: string | undefined;
 };
-declare type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
-declare type ISqlBatch = {
+type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
+type ISqlBatch = {
     thisKey: IASTChildColumn;
     parentKey: IASTChildColumn;
 };
-declare type IJunction = {
+type IJunction = {
     sqlTable: string;
     as: string;
     uniqueKey: string | string[];
@@ -84,7 +84,7 @@ declare type IJunction = {
     where?: IWhere;
     sqlJoins: ISqlJoin[];
 };
-export declare type IGetSQLASTInput = {
+export type IGetSQLASTInput = {
     table: string;
     fieldName: string;
     fields: IField[];
@@ -101,17 +101,17 @@ export declare type IGetSQLASTInput = {
     dialect: IDialect;
     firstChild?: IASTChildColumn | IASTChildComposite;
 };
-export declare type IRelation = {
+export type IRelation = {
     table: string;
     foreignKey: string;
     referencedTable: string;
     referencedKey: string;
     nullable: boolean;
 };
-declare type IOneToManyOrManyToOne = "one-to-many__many-to-one";
-declare type IManyToMany = "many-to-many";
-declare type IRelationKind = "one-to-many" | "many-to-one";
-export declare type IRelationOneToManyOrManyToOne = {
+type IOneToManyOrManyToOne = "one-to-many__many-to-one";
+type IManyToMany = "many-to-many";
+type IRelationKind = "one-to-many" | "many-to-one";
+export type IRelationOneToManyOrManyToOne = {
     type: IOneToManyOrManyToOne;
     kind: IRelationKind;
     grabMany: boolean;
@@ -120,7 +120,7 @@ export declare type IRelationOneToManyOrManyToOne = {
     relation: IRelation;
     nullable: boolean;
 };
-export declare type IRelationManyToMany = {
+export type IRelationManyToMany = {
     type: IManyToMany;
     grabMany: boolean;
     table: string;
@@ -128,8 +128,8 @@ export declare type IRelationManyToMany = {
     name: string;
     relations: IRelation[];
 };
-export declare type IRelationField = IRelationOneToManyOrManyToOne | IRelationManyToMany;
-export declare type IMappedField = {
+export type IRelationField = IRelationOneToManyOrManyToOne | IRelationManyToMany;
+export type IMappedField = {
     name: string;
     as: string;
     type: string;
@@ -139,7 +139,7 @@ export declare type IMappedField = {
     referencedTable: string;
     referencedKey: string;
 };
-export declare type IArtifacts = {
+export type IArtifacts = {
     [k: string]: {
         table: string;
         primaryKey: string;

package/dist/runtime/Stats.d.ts

@@ -4,9 +4,5 @@ declare class Stats {
     constructor(client: Redis | Cluster);
     updateStats: (ms: number, category: string) => Promise<void>;
 }
-declare namespace timer {
-    type Callback = (time: number, ...params: any[]) => void;
-    type Params<T> = T extends (ms: number, ...params: infer U) => any ? U : never;
-}
 export declare function timer(): <T extends timer.Callback>(callback: T, ...args: timer.Params<T>) => void;
 export default Stats;

package/dist/runtime/Stats.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timer = void 0;
+exports.timer = timer;
 const perf_hooks_1 = require("perf_hooks");
 class Stats {
     constructor(client) {
@@ -28,5 +28,4 @@ function timer() {
         callback(perf_hooks_1.performance.now() - start, ...args);
     };
 }
-exports.timer = timer;
 exports.default = Stats;

package/dist/runtime/lib/addNullFallbacks.js

@@ -2,7 +2,7 @@
 // If a many-to-one relation's ID field is null, we want the
 // relation field to be null as well, not undefined.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addNullFallbacks = void 0;
+exports.addNullFallbacks = addNullFallbacks;
 function addNullFallbacks(sqlAST, data) {
     if (data == null) {
         return;
@@ -30,4 +30,3 @@ function addNullFallbacks(sqlAST, data) {
         }
     }
 }
-exports.addNullFallbacks = addNullFallbacks;

package/dist/runtime/lib/cursor.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeCursor = exports.encodeCursor = void 0;
+exports.encodeCursor = encodeCursor;
+exports.decodeCursor = decodeCursor;
 function encodeCursor(cursor) {
     return Buffer.from(JSON.stringify(cursor)).toString("base64");
 }
-exports.encodeCursor = encodeCursor;
 function decodeCursor(cursor) {
     return JSON.parse(Buffer.from(cursor, "base64").toString("utf8"));
 }
-exports.decodeCursor = decodeCursor;

package/dist/runtime/lib/getDateTimeStringMySQL.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDateTimeStringMySQL = void 0;
+exports.getDateTimeStringMySQL = getDateTimeStringMySQL;
 // Assumes input uses zero offset
 function getDateTimeStringMySQL(dateTimeString) {
     return dateTimeString.replace("T", " ").slice(0, 19);
 }
-exports.getDateTimeStringMySQL = getDateTimeStringMySQL;

package/dist/runtime/lib/getOrderBy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderBy = void 0;
+exports.getOrderBy = getOrderBy;
 // https://gist.github.com/pcattori/2bb645d587e45c9fdbcabf5cef7a7106
 function getOrderBy(args, primaryKey) {
     let out = undefined;
@@ -41,7 +41,6 @@ function getOrderBy(args, primaryKey) {
     }
     return { orderBy: out, flip };
 }
-exports.getOrderBy = getOrderBy;
 function getFlip(args) {
     return args?.$paginate?.last != null;
 }

package/dist/runtime/lib/getSqlAst.js

@@ -1,21 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSqlAst = void 0;
+exports.getSqlAst = getSqlAst;
 const SqlString = require("sqlstring");
 // @ts-ignore
-const TSqlString = require("tsqlstring");
-// @ts-ignore
 const alias_namespace_1 = require("join-monster/dist/alias-namespace");
 const _ = require("lodash/fp");
 const getOrderBy_1 = require("./getOrderBy");
 const namespace = new alias_namespace_1.default(true);
 function getSqlAst(input) {
-    const { table, fieldName, fields, args, grabMany, sqlJoin, sqlBatch, junction, getWhere, artifacts, rowWithMatchingCursor, dialect, } = input;
+    const { table, fieldName, fields, args, grabMany, sqlJoin, sqlBatch, junction, getWhere, artifacts, rowWithMatchingCursor, dialect } = input;
     const tableArtifacts = artifacts[table];
     const primaryKey = tableArtifacts.primaryKey;
-    const format = dialect === "mysql"
-        ? SqlString.format.bind(SqlString)
-        : TSqlString.format.bind(TSqlString);
+    const format = SqlString.format.bind(SqlString);
     const orderBy = input.orderBy ?? (0, getOrderBy_1.getOrderBy)(args, primaryKey)?.orderBy;
     let where = input.where;
     if (input.where == null) {
@@ -74,12 +70,12 @@ function getSqlAst(input) {
                                 referencedTableAlias,
                                 referencedTableAlias,
                                 mappedField.referencedKey,
-                                mappedField.foreignKey,
+                                mappedField.foreignKey
                             ]);
                         },
                         name: x,
                         fieldName: x,
-                        as: namespace.generate("column", x),
+                        as: namespace.generate("column", x)
                     };
                 }
                 // TODO - validate in dev?
@@ -105,7 +101,7 @@ function getSqlAst(input) {
                         // Notice the duplicate names in the select. This results in missing rows because the
                         // shape definition passed into NestHydrationJS will only have 1 `id`.
                         fieldName: String(Date.now()),
-                        as: String(Date.now()),
+                        as: String(Date.now())
                     },
                     junction: {
                         sqlTable: relationField.junctionTable,
@@ -118,8 +114,7 @@ function getSqlAst(input) {
                                 return undefined;
                             }
                             const argsMapped = _.cloneDeep(args);
-                            argsMapped.$where =
-                                argsMapped.$where[relationField.junctionTable];
+                            argsMapped.$where = argsMapped.$where[relationField.junctionTable];
                             const whereResult = getWhere(
                             // table is escaped already
                             table, argsMapped, dialect, orderBy, rowWithMatchingCursor);
@@ -143,12 +138,12 @@ function getSqlAst(input) {
                         sqlBatch: {
                             thisKey: columnToASTChild(relationField.relations[0].foreignKey, namespace, asJunction),
                             parentKey: columnToASTChild(relationField.relations[0].referencedKey, namespace),
-                            sqlJoin: (junctionTable, t, args) => `${junctionTable}.${relationField.relations[1].foreignKey} = ${t}.${relationField.relations[1].referencedKey}`,
-                        },
+                            sqlJoin: (junctionTable, t, args) => `${junctionTable}.${relationField.relations[1].foreignKey} = ${t}.${relationField.relations[1].referencedKey}`
+                        }
                     },
                     getWhere,
                     artifacts,
-                    dialect,
+                    dialect
                 });
             }
             return getSqlAst({
@@ -174,16 +169,15 @@ function getSqlAst(input) {
                 // sub lists are limited, too.
                 sqlBatch: {
                     thisKey: columnToASTChild(relationField.relation.referencedKey, namespace),
-                    parentKey: columnToASTChild(relationField.relation.foreignKey, namespace),
+                    parentKey: columnToASTChild(relationField.relation.foreignKey, namespace)
                 },
                 getWhere,
                 artifacts,
-                dialect,
+                dialect
             });
-        })),
+        }))
     };
 }
-exports.getSqlAst = getSqlAst;
 function keyToASTChild(key, namespace, fromOtherTable) {
     if (Array.isArray(key)) {
         const clumsyName = toClumsyName(key);
@@ -192,7 +186,7 @@ function keyToASTChild(key, namespace, fromOtherTable) {
             name: key,
             fieldName: clumsyName,
             as: namespace.generate("column", clumsyName),
-            fromOtherTable,
+            fromOtherTable
         };
     }
     return columnToASTChild(key, namespace, fromOtherTable);
@@ -203,7 +197,7 @@ function columnToASTChild(columnName, namespace, fromOtherTable) {
         name: columnName,
         fieldName: columnName,
         as: namespace.generate("column", columnName),
-        fromOtherTable,
+        fromOtherTable
     };
 }
 function toClumsyName(keyArr) {

package/dist/runtime/lib/getWhere.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWhere = void 0;
+exports.getWhere = getWhere;
 const stringifyWhere_1 = require("./stringifyWhere");
 function getWhere(
 // Note: `table` is not escaped in getWhere, so it should be escaped beforehand.
@@ -18,4 +18,3 @@ table, args, dialect, orderBy, rowWithMatchingCursor) {
         rowWithMatchingCursor,
     }) || null);
 }
-exports.getWhere = getWhere;

package/dist/runtime/lib/runTransforms.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTransforms = void 0;
+exports.runTransforms = runTransforms;
 function runTransforms(data, fields) {
     if (data == null) {
         return;
@@ -33,4 +33,3 @@ function runTransforms(data, fields) {
         }
     }
 }
-exports.runTransforms = runTransforms;