npm - @casekit/orm - Versions diffs - 0.0.1-alpha.7 → 0.0.1-alpha.9 - Mend

@casekit/orm 0.0.1-alpha.7 → 0.0.1-alpha.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (245) hide show

package/lib/queries/create/buildCreate.js CHANGED Viewed

@@ -4,7 +4,7 @@ export const buildCreate = (config, m, params, _tableIndex = 0) => {
     const builder = {
         tableIndex: _tableIndex,
         table: {
-            name: config.models[m].table,
+            table: config.models[m].table,
             schema: config.models[m].schema,
         },
         params: [],

package/lib/queries/create/buildCreate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildCreate.js","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC5B,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,~~IAAI~~,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;~~YAC5B~~,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;SAClC;QACD,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;QAC5B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC,CACV,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE;YACxD,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CAAC,CAAC;IAEP,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,KAAK,IAAI,QAAQ,EAAE,EAAE;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAEvC,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
1	+ {"version":3,"file":"buildCreate.js","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAWhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC5B,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;SAClC;QACD,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,EAAE;KAChB,CAAC;IAEF,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;QAC5B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC,CACV,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QACnB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE;YACxD,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE;SACtB,CAAC,CAAC;IAEP,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAClC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,KAAK,IAAI,QAAQ,EAAE,EAAE;SAClC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAEvC,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}

package/lib/queries/create/createResultSchema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,oBAAoB,GAAG,mBAAmB;;;;~~EAYrD~~,CAAC"}
1	+ {"version":3,"file":"createResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,oBAAoB,GAAG,mBAAmB;;;;EAcrD,CAAC"}

package/lib/queries/create/createResultSchema.js CHANGED Viewed

@@ -5,7 +5,9 @@ export const createResultSchema = (config, m, params) => {
     const obj = {};
     params.returning?.forEach((s) => {
         const col = config.models[m].columns[s];
-        obj[s] = col.nullable ? col.zodSchema.nullable() : col.zodSchema;
+        obj[s] = col.nullable
+            ? col.zodSchema.nullish().transform((x) => x ?? null)
+            : col.zodSchema;
     });
     return z.object(obj);
 };

package/lib/queries/create/createResultSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createResultSchema.js","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAKnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAkD,EACpD,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,~~GAAG~~,CAAC,SAAS,CAAC,~~QAAQ~~,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;~~IACrE~~,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
1	+ {"version":3,"file":"createResultSchema.js","sourceRoot":"","sources":["../../../src/queries/create/createResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAKnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAkD,EACpD,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ;YACjB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}

package/lib/queries/create/createToSql.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,~~YAkCpD~~,CAAC"}
1	+ {"version":3,"file":"createToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,eAAO,MAAM,WAAW,YAAa,aAAa,KAAG,YAsCpD,CAAC"}

package/lib/queries/create/createToSql.js CHANGED Viewed

@@ -4,10 +4,10 @@ export const createToSql = (builder) => {
     const frag = new SQLStatement();
     const { table, params, returning } = builder;
     if (params.length === 0) {
-        frag.push(pgfmt("INSERT INTO %I.%I DEFAULT VALUES", table.schema, table.name));
+        frag.push(pgfmt("INSERT INTO %I.%I DEFAULT VALUES", table.schema, table.table));
     }
     else {
-        frag.push(pgfmt("INSERT INTO %I.%I (\n", table.schema, table.name));
+        frag.push(pgfmt("INSERT INTO %I.%I (\n", table.schema, table.table));
         frag.push(params.map((p) => pgfmt("    %I", p.name)).join(",\n"));
         frag.push(") VALUES ");
         const values = params[0].values.map((_, index) => {

package/lib/queries/create/createToSql.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createToSql.js","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgB,EAAE;IAChE,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAEhC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CACL,KAAK,~~CAAC~~,kCAAkC,~~EAAE~~,KAAK,CAAC,MAAM,~~EAAE~~,KAAK,CAAC,~~IAAI~~,~~CAAC~~,~~CACtE~~,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,~~IAAI~~,CAAC,CAAC,CAAC;~~QACpE~~,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,OAAO,GAAG,CAAA,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;aAClD,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
1	+ {"version":3,"file":"createToSql.js","sourceRoot":"","sources":["../../../src/queries/create/createToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAgB,EAAE;IAChE,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAEhC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE7C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CACL,KAAK,CACD,kCAAkC,EAClC,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,KAAK,CACd,CACJ,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC7C,OAAO,GAAG,CAAA,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACrE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,SAAS,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;aAClD,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}

package/lib/queries/create/types/CreateManyParams.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { ReturningClause } from "../../clauses/ReturningClause";
 import { CreateValues } from "./CreateOneParams";
 export type CreateManyParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
     values: CreateValues<Models, M>[];
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
     onConflict?: {
         do: "nothing";
     };

package/lib/queries/create/types/CreateManyParams.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CreateManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QACT,EAAE,EAAE,SAAS,CAAC;KACjB,CAAC;CACL,CAAC"}
1	+ {"version":3,"file":"CreateManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QACT,EAAE,EAAE,SAAS,CAAC;KACjB,CAAC;CACL,CAAC"}

package/lib/queries/create/types/CreateManyResult.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
 import { ReturningClause } from "../../clauses/ReturningClause";
 import { CreateManyParams } from "./CreateManyParams";
 import { CreateOneParams } from "./CreateOneParams";
-export type CreateManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends ReturningClause<Models, M> ? Readonly<{
+export type CreateManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends ReturningClause<Models[M]> ? Readonly<{
     [C in P["returning"][number]]: ColumnType<Models, M, C>;
 }>[] : number;
 //# sourceMappingURL=CreateManyResult.d.ts.map

package/lib/queries/create/types/CreateManyResult.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CreateManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,EAAE,GACJ,MAAM,CAAC"}
1	+ {"version":3,"file":"CreateManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,EAAE,GACJ,MAAM,CAAC"}

package/lib/queries/create/types/CreateOneParams.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { RequiredParams } from "../../clauses/helpers/RequiredParams";
 export type CreateValues<Models extends LooseModelDefinitions, M extends ModelName<Models>> = Simplify<RequiredParams<Models, M> & OptionalParams<Models, M>>;
 export type CreateOneParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
     values: CreateValues<Models, M>;
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
     onConflict?: {
         do: "nothing";
     };

package/lib/queries/create/types/CreateOneParams.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CreateOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QACT,EAAE,EAAE,SAAS,CAAC;KACjB,CAAC;CACL,CAAC"}
1	+ {"version":3,"file":"CreateOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,UAAU,CAAC,EAAE;QACT,EAAE,EAAE,SAAS,CAAC;KACjB,CAAC;CACL,CAAC"}

package/lib/queries/create/types/CreateOneResult.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
 import { SelectClause } from "../../clauses/SelectClause";
 import { CreateManyParams } from "./CreateManyParams";
 import { CreateOneParams } from "./CreateOneParams";
-export type CreateOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends SelectClause<Models, M> ? Readonly<{
+export type CreateOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends CreateOneParams<Models, M> | CreateManyParams<Models, M>> = P["returning"] extends SelectClause<Models[M]> ? Readonly<{
     [C in P["returning"][number]]: ColumnType<Models, M, C>;
 }> : number;
 //# sourceMappingURL=CreateOneResult.d.ts.map

package/lib/queries/create/types/CreateOneResult.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CreateOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,YAAY,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,GACxC,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}
1	+ {"version":3,"file":"CreateOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/create/types/CreateOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAElE,CAAC,CAAC,WAAW,CAAC,SAAS,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GACxC,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}

package/lib/queries/createMany.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createMany.d.ts","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,oBAAoB,~~uDAqB~~/B,CAAC"}
1	+ {"version":3,"file":"createMany.d.ts","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,oBAAoB,uDAwB/B,CAAC"}

package/lib/queries/createMany.js CHANGED Viewed

@@ -13,8 +13,10 @@ export const createMany = async (conn, config, m, params) => {
         sql: statement.text,
         values: statement.values,
     });
-    if (!process.env.CI)
+    if (process.env.ORM_VERBOSE_LOGGING) {
         console.log(statement.text);
+        console.log(statement.values);
+    }
     const result = await conn.query(statement);
     return params.returning
         ? result.rows.map(rowToObject(builder.returning))

package/lib/queries/createMany.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createMany.js","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC9B,EAAE;IACA,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,~~CAAC,~~OAAO,CAAC,GAAG,CAAC,EAAE;~~QAAE~~,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;~~IAEjD~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAC1B,CAAC,CAAC"}
1	+ {"version":3,"file":"createMany.js","sourceRoot":"","sources":["../../src/queries/createMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAA4B,EAC9B,EAAE;IACA,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAC1B,CAAC,CAAC"}

package/lib/queries/delete/buildDelete.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { BaseDeleteParams } from "./types/BaseDeleteParams";
 export type DeleteBuilder = {
     tableIndex: number;
     table: {
-        name: string;
+        table: string;
         model: string;
         alias: string;
         schema: string;

package/lib/queries/delete/buildDelete.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildDelete.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,~~IAAI~~,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;~~IACtE~~,KAAK,EAAE,WAAW,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5E,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,gBAAgB,2BAEzB,aAkCF,CAAC"}
1	+ {"version":3,"file":"buildDelete.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,KAAK,EAAE,WAAW,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC5E,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9D,CAAC;AAEF,eAAO,MAAM,WAAW,WACZ,iBAAiB,KACtB,MAAM,UACD,gBAAgB,2BAEzB,aAkCF,CAAC"}

package/lib/queries/delete/buildDelete.js CHANGED Viewed

@@ -4,7 +4,7 @@ export const buildDelete = (config, m, params, _tableIndex = 0) => {
     const builder = {
         tableIndex: _tableIndex,
         table: {
-            name: config.models[m].table,
+            table: config.models[m].table,
             schema: config.models[m].schema,
             model: m,
             alias: tableAlias(_tableIndex++),

package/lib/queries/delete/buildDelete.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildDelete.js","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAUhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAAwB,EACxB,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,~~IAAI~~,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;~~YAC5B~~,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;YAC/B,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;SACnC;QACD,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK;YAClC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;gBACzC,MAAM;gBACN,KAAK,EAAE,CAAC;aACX,CAAE;YACL,CAAC,CAAC,MAAM,CAAC,KAAK;QAClB,SAAS,EAAE,EAAE;KAChB,CAAC;IACF,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE/B,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,+CAA+C,EAAE;YAChE,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,EAAE,EAAE;SAChD,CAAC,CAAC;IACP,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
1	+ {"version":3,"file":"buildDelete.js","sourceRoot":"","sources":["../../../src/queries/delete/buildDelete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIxC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAUhD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,MAAwB,EACxB,WAAW,GAAG,CAAC,EACF,EAAE;IACf,MAAM,OAAO,GAAkB;QAC3B,UAAU,EAAE,WAAW;QACvB,KAAK,EAAE;YACH,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;YAC/B,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;SACnC;QACD,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK;YAClC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;gBACzC,MAAM;gBACN,KAAK,EAAE,CAAC;aACX,CAAE;YACL,CAAC,CAAC,MAAM,CAAC,KAAK;QAClB,SAAS,EAAE,EAAE;KAChB,CAAC;IACF,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE/B,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,+CAA+C,EAAE;YAChE,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;SAC7B,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,EAAE,EAAE;SAChD,CAAC,CAAC;IACP,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}

package/lib/queries/delete/deleteResultSchema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deleteResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,gBAAgB;;;;~~EAY3B~~,CAAC"}
1	+ {"version":3,"file":"deleteResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,eAAO,MAAM,kBAAkB,WACnB,iBAAiB,KACtB,MAAM,UACD,gBAAgB;;;;EAc3B,CAAC"}

package/lib/queries/delete/deleteResultSchema.js CHANGED Viewed

@@ -5,7 +5,9 @@ export const deleteResultSchema = (config, m, params) => {
     const obj = {};
     params.returning?.forEach((s) => {
         const col = config.models[m].columns[s];
-        obj[s] = col.nullable ? col.zodSchema.nullable() : col.zodSchema;
+        obj[s] = col.nullable
+            ? col.zodSchema.nullish().transform((x) => x ?? null)
+            : col.zodSchema;
     });
     return z.object(obj);
 };

package/lib/queries/delete/deleteResultSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deleteResultSchema.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,~~GAAG~~,CAAC,SAAS,CAAC,~~QAAQ~~,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;~~IACrE~~,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
1	+ {"version":3,"file":"deleteResultSchema.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAC9B,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ;YACjB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}

package/lib/queries/delete/deleteToSql.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { buildWhereClauses } from "../clauses/where/buildWhereClauses";
 import { hasConditions } from "../util/hasConditions";
 export const deleteToSql = (config, m, builder) => {
     const { table, where, returning } = builder;
-    const frag = sql `DELETE FROM %I.%I AS %I`.withIdentifiers(table.schema, table.name, table.alias);
+    const frag = sql `DELETE FROM %I.%I AS %I`.withIdentifiers(table.schema, table.table, table.alias);
     if (!hasConditions(where)) {
         throw new OrmError(`No where clause provided for delete`, {
             data: {

package/lib/queries/delete/deleteToSql.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deleteToSql.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,OAAsB,EACV,EAAE;IACd,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE5C,MAAM,IAAI,GAAG,GAAG,CAAA,yBAAyB,CAAC,eAAe,CACrD,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,~~IAAI~~,~~EACV~~,KAAK,CAAC,KAAK,CACd,CAAC;IAEF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE;YACtD,IAAI,EAAE;gBACF,KAAK;gBACL,KAAK;gBACL,SAAS;aACZ;SACJ,CAAC,CAAC;IACP,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAEnD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACP,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CACzD;aACA,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
1	+ {"version":3,"file":"deleteToSql.js","sourceRoot":"","sources":["../../../src/queries/delete/deleteToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAgB,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,WAAW,GAAG,CACvB,MAAyB,EACzB,CAAS,EACT,OAAsB,EACV,EAAE;IACd,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE5C,MAAM,IAAI,GAAG,GAAG,CAAA,yBAAyB,CAAC,eAAe,CACrD,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,KAAK,CACd,CAAC;IAEF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE;YACtD,IAAI,EAAE;gBACF,KAAK;gBACL,KAAK;gBACL,SAAS;aACZ;SACJ,CAAC,CAAC;IACP,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAEnD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CACL,SAAS;aACJ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACP,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CACzD;aACA,IAAI,CAAC,KAAK,CAAC,CACnB,CAAC;IACN,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjB,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}

package/lib/queries/delete/types/DeleteManyResult.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ModelName } from "../../../schema/types/helpers/ModelName";
 import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
 import { ReturningClause } from "../../clauses/ReturningClause";
 import { DeleteParams } from "./DeleteParams";
-export type DeleteManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models, M> ? Readonly<{
+export type DeleteManyResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models[M]> ? Readonly<{
     [C in P["returning"][number]]: ColumnType<Models, M, C>;
 }>[] : number;
 //# sourceMappingURL=DeleteManyResult.d.ts.map

package/lib/queries/delete/types/DeleteManyResult.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeleteManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,EAAE,GACJ,MAAM,CAAC"}
1	+ {"version":3,"file":"DeleteManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,EAAE,GACJ,MAAM,CAAC"}

package/lib/queries/delete/types/DeleteOneResult.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ModelName } from "../../../schema/types/helpers/ModelName";
 import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
 import { ReturningClause } from "../../clauses/ReturningClause";
 import { DeleteParams } from "./DeleteParams";
-export type DeleteOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models, M> ? Readonly<{
+export type DeleteOneResult<Models extends LooseModelDefinitions, M extends ModelName<Models>, P extends DeleteParams<Models, M>> = P["returning"] extends ReturningClause<Models[M]> ? Readonly<{
     [C in P["returning"][number]]: ColumnType<Models, M, C>;
 }> : number;
 //# sourceMappingURL=DeleteOneResult.d.ts.map

package/lib/queries/delete/types/DeleteOneResult.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeleteOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}
1	+ {"version":3,"file":"DeleteOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,eAAe,CACvB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,IAEjC,CAAC,CAAC,WAAW,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAC3C,QAAQ,CAAC;KACJ,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1D,CAAC,GACF,MAAM,CAAC"}

package/lib/queries/delete/types/DeleteParams.d.ts CHANGED Viewed

@@ -4,6 +4,6 @@ import { ReturningClause } from "../../clauses/ReturningClause";
 import { WhereClause } from "../../clauses/WhereClause";
 export type DeleteParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
     where: WhereClause<Models, M>;
-    returning?: ReturningClause<Models, M>;
+    returning?: ReturningClause<Models[M]>;
 };
 //# sourceMappingURL=DeleteParams.d.ts.map

package/lib/queries/delete/types/DeleteParams.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeleteParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,CAAC;CAC1C,CAAC"}
1	+ {"version":3,"file":"DeleteParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/delete/types/DeleteParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1C,CAAC"}

package/lib/queries/deleteMany.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,gBAAgB,~~gDAgB3B~~,CAAC"}
1	+ {"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,eAAO,MAAM,UAAU,SACb,UAAU,UACR,iBAAiB,KACtB,MAAM,UACD,gBAAgB,gDAmB3B,CAAC"}

package/lib/queries/deleteMany.js CHANGED Viewed

@@ -10,8 +10,10 @@ export const deleteMany = async (conn, config, m, params) => {
         sql: statement.text,
         values: statement.values,
     });
-    if (!process.env.CI)
+    if (process.env.ORM_VERBOSE_LOGGING) {
         console.log(statement.text);
+        console.log(statement.values);
+    }
     const result = await conn.query(statement);
     return params.returning
         ? result.rows.map(rowToObject(builder.returning))

package/lib/queries/deleteMany.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deleteMany.js","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,~~CAAC,~~OAAO,CAAC,GAAG,CAAC,EAAE;~~QAAE~~,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;~~IAEjD~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC"}
1	+ {"version":3,"file":"deleteMany.js","sourceRoot":"","sources":["../../src/queries/deleteMany.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC3B,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,MAAwB,EAC1B,EAAE;IACA,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,kBAAkB;QAC3B,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,MAAM;KAC3B,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,SAAS;QACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC"}

package/lib/queries/find/buildFind.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildFind.d.ts","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,KACtB,MAAM,SACF,cAAc,SACf,MAAM,EAAE,2BAEf,~~WAoHF~~,CAAC"}
1	+ {"version":3,"file":"buildFind.d.ts","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,KACtB,MAAM,SACF,cAAc,SACf,MAAM,EAAE,2BAEf,WA0HF,CAAC"}

package/lib/queries/find/buildFind.js CHANGED Viewed

@@ -3,23 +3,26 @@ import { ensureArray } from "../../util/ensureArray";
 import { tableAlias } from "../util/tableAlias";
 export const buildFind = (config, m, query, path = [], _tableIndex = 0) => {
     const builder = {
-        tableIndex: _tableIndex,
         columns: [],
-        tables: [],
+        table: {
+            table: config.models[m]["table"],
+            model: m,
+            schema: config.models[m]["schema"],
+            alias: tableAlias(_tableIndex++),
+            where: config.middleware.find?.where
+                ? config.middleware.find.where(query.where, {
+                    config,
+                    model: m,
+                })
+                : query.where,
+            joins: [],
+        },
         orderBy: [],
+        tableIndex: _tableIndex,
     };
     const model = config.models[m];
-    const alias = tableAlias(builder.tableIndex++);
+    const alias = builder.table.alias;
     let colIndex = 0;
-    builder.tables.push({
-        name: config.models[m]["table"],
-        model: m,
-        schema: config.models[m]["schema"],
-        alias: alias,
-        where: config.middleware.find?.where
-            ? config.middleware.find.where(query.where, { config, model: m })
-            : query.where,
-    });
     // make sure we always select the model's primary key,
     // and if necessary the foreign key for a lateral join
     // - we'll strip them out later
@@ -41,30 +44,31 @@ export const buildFind = (config, m, query, path = [], _tableIndex = 0) => {
         const joinedModel = config.models[relation.model];
         if (relation.type === "N:1") {
             const joinBuilder = buildFind(config, relation.model, subquery, [...path, r], builder.tableIndex++);
-            const [joinedTable, ...otherTables] = joinBuilder.tables;
-            builder.tables.push({
-                ...joinedTable,
-                joins: [
-                    ...(joinedTable.joins ?? []),
-                    {
-                        from: {
-                            table: alias,
-                            columns: ensureArray(relation.foreignKey).map((c) => model.columns[c].name),
-                        },
-                        to: {
-                            table: joinedTable.alias,
-                            columns: joinedModel.primaryKey.map((c) => joinedModel.columns[c].name),
-                        },
-                    },
-                ],
-            });
+            const joinedTable = joinBuilder.table;
+            builder.table.joins.push({
+                from: {
+                    schema: config.models[m].schema,
+                    table: config.models[m].table,
+                    alias,
+                    model: m,
+                    columns: ensureArray(relation.foreignKey).map((c) => model.columns[c].name),
+                },
+                to: {
+                    schema: joinedModel.schema,
+                    table: joinedTable.table,
+                    alias: joinedTable.alias,
+                    model: relation.model,
+                    columns: joinedModel.primaryKey.map((c) => joinedModel.columns[c].name),
+                },
+                type: relation.optional ? "left" : "inner",
+                where: joinedTable.where,
+            }, ...joinedTable.joins);
             // this is admittedly a bit weird,
             // we wouldn't expect N:1 relations to specify
             // ordering, skipping, and limiting, and typescript
             // prevents users from doing this, but
             // we rely on them being present as part of the N:N
             // implementation
-            builder.tables.push(...otherTables);
             builder.columns.push(...joinBuilder.columns);
             builder.orderBy.push(...joinBuilder.orderBy);
             builder.limit = min([builder.limit, joinBuilder.limit]);

package/lib/queries/find/buildFind.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildFind.js","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,MAAM,CAAC,MAAM,SAAS,GAAG,CACrB,MAAyB,EACzB,CAAS,EACT,KAAqB,EACrB,OAAiB,EAAE,EACnB,WAAW,GAAG,CAAC,EACJ,EAAE;IACb,MAAM,OAAO,GAAgB;QACzB,~~UAAU,EAAE,WAAW;QACvB,~~OAAO,EAAE,EAAE;QACX,~~MAAM~~,EAAE~~,EAAE~~;~~QACV~~,~~OAAO~~,EAAE,~~EAAE;KACd~~,CAAC~~;IAEF~~,MAAM,~~KAAK~~,~~GAAG~~,~~MAAM~~,CAAC,~~MAAM~~,CAAC,~~CAAC~~,~~CAAC~~,CAAC;~~IAE/B~~,MAAM,~~KAAK~~,~~GAAG~~,~~UAAU,~~CAAC,~~OAAO~~,CAAC,~~UAAU~~,~~EAAE~~,CAAC,CAAC;~~IAC/C~~,~~IAAI~~,~~QAAQ~~,~~GAAG~~,CAAC,CAAC;~~IAEjB~~,~~OAAO~~,~~CAAC~~,MAAM,CAAC,~~IAAI~~,CAAC~~;QAChB~~,IAAI,EAAE,~~MAAM~~,CAAC,MAAM,CAAC,~~CAAC~~,CAAC,CAAC,~~OAAO~~,CAAC~~;QAC/B~~,KAAK,~~EAAE,~~CAAC~~;QACR~~,~~MAAM~~,EAAE,MAAM,~~CAAC~~,~~MAAM~~,CAAC,CAAC,CAAC,CAAC,~~QAAQ~~,CAAC;~~QAClC~~,KAAK,EAAE,~~KAAK~~;~~QACZ~~,~~KAAK~~,EAAE,~~MAAM~~,~~CAAC,~~UAAU,~~CAAC,IAAI,~~EAAE,~~KAAK~~;~~YAChC~~,CAAC,~~CAAC~~,MAAM,CAAC,~~UAAU~~,CAAC,~~IAAI~~,CAAC,~~KAAK,~~CAAC,~~KAAK~~,~~CAAC,~~KAAK,~~EAAE~~,~~EAAE~~,~~MAAM~~,~~EAAE,~~KAAK,~~EAAE,~~CAAC,~~EAAE~~,CAAC;~~YACjE~~,~~CAAC~~,~~CAAC~~,~~KAAK~~,CAAC,~~KAAK;KACpB,~~CAAC~~,CAAC~~;~~IAEH~~,sDAAsD;IACtD,sDAAsD;IACtD,+BAA+B;IAC/B,MAAM,MAAM,GAAG,IAAI,CAAC;QAChB,GAAG,KAAK,CAAC,MAAM;QACf,GAAG,KAAK,CAAC,UAAU;QACnB,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC;KACzD,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YACjB,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9B,KAAK,EAAE,GAAG,KAAK,IAAI,QAAQ,EAAE,EAAE;YAC/B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;SACrB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,WAAW,GAAG,SAAS,CACzB,MAAM,EACN,QAAQ,CAAC,KAAK,EACd,QAAS,EACT,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,EACZ,OAAO,CAAC,UAAU,EAAE,CACvB,CAAC;YACF,MAAM,~~CAAC,~~WAAW,~~EAAE,~~GAAG,WAAW,CAAC,~~GAAG~~,~~WAAW~~,CAAC,~~MAAM~~,CAAC;~~YACzD~~,~~OAAO~~,CAAC,MAAM,CAAC,~~IAAI~~,CAAC~~;gBAChB~~,~~GAAG~~,~~WAAW~~;~~gBACd~~,KAAK,EAAE~~;oBACH~~,~~GAAG~~,CAAC,~~WAAW~~,CAAC,~~KAAK~~,~~IAAI~~,~~EAAE~~,~~CAAC~~;~~oBAC5B;wBACI~~,~~IAAI,EAAE~~;~~4BACF~~,KAAK,EAAE,~~KAAK~~;~~4BACZ~~,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAC/B;~~yBACJ~~;~~wBACD~~,EAAE,EAAE;~~4BACA~~,KAAK,EAAE,WAAW,CAAC,KAAK;~~4BACxB~~,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,GAAG,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CACrC;~~yBACJ~~;~~qBACJ~~;~~iBACJ~~;~~aACJ~~,CAAC,CAAC;~~YACH~~,kCAAkC;YAClC,8CAA8C;YAC9C,mDAAmD;YACnD,sCAAsC;YACtC,mDAAmD;YACnD,iBAAiB;YACjB,OAAO,CAAC,~~MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YACpC,~~OAAO,CAAC,~~OAAO,CAAC,~~IAAI,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YACxD,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QAClB,OAAO,CAAC,SAAS,GAAG;YAChB,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC5C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3C,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClD,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI;gBAClC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI;gBAChC,MAAM;aACT,CAAC,CAAC;SACN,CAAC;IACN,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACxC,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;SAC7C,CAAC,CAAC,CAAC;IACR,CAAC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
1	+ {"version":3,"file":"buildFind.js","sourceRoot":"","sources":["../../../src/queries/find/buildFind.ts"],"names":[],"mappings":"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"}

package/lib/queries/find/findResultSchema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"findResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,eAAO,MAAM,gBAAgB,WACjB,iBAAiB,KACtB,MAAM,SACF,cAAc;;;;~~EAgBxB~~,CAAC"}
1	+ {"version":3,"file":"findResultSchema.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAEnC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,eAAO,MAAM,gBAAgB,WACjB,iBAAiB,KACtB,MAAM,SACF,cAAc;;;;EAuBxB,CAAC"}

package/lib/queries/find/findResultSchema.js CHANGED Viewed

@@ -3,12 +3,19 @@ export const findResultSchema = (config, m, query) => {
     const obj = {};
     query.select.forEach((field) => {
         const col = config.models[m].columns[field];
-        obj[field] = col.nullable ? col.zodSchema.nullable() : col.zodSchema;
+        obj[field] = col.nullable
+            ? col.zodSchema.nullish().transform((x) => x ?? null)
+            : col.zodSchema;
     });
     for (const [field, subquery] of Object.entries(query.include || {})) {
         const relation = config.relations[m][field];
         const schema = findResultSchema(config, relation.model, subquery);
-        obj[field] = relation.type === "N:1" ? schema : z.array(schema);
+        obj[field] =
+            relation.type === "N:1"
+                ? relation.optional
+                    ? schema.nullish().transform((x) => x ?? null)
+                    : schema
+                : z.array(schema);
     }
     return z.object(obj);
 };

package/lib/queries/find/findResultSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"findResultSchema.js","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,MAAyB,EACzB,CAAS,EACT,KAAqB,EACvB,EAAE;IACA,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,~~GAAG~~,CAAC,SAAS,CAAC,~~QAAQ~~,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;~~IACzE~~,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAS,CAAC,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,~~GAAG,~~QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;~~IACpE~~,CAAC;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
1	+ {"version":3,"file":"findResultSchema.js","sourceRoot":"","sources":["../../../src/queries/find/findResultSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,CAAC,EAAE,MAAM,KAAK,CAAC;AAInC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,MAAyB,EACzB,CAAS,EACT,KAAqB,EACvB,EAAE;IACA,MAAM,GAAG,GAAuC,EAAE,CAAC;IAEnD,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ;YACrB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;YACrD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAS,CAAC,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC;YACN,QAAQ,CAAC,IAAI,KAAK,KAAK;gBACnB,CAAC,CAAC,QAAQ,CAAC,QAAQ;oBACf,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;oBAC9C,CAAC,CAAC,MAAM;gBACZ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}

package/lib/queries/find/findToSql.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"findToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAI9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,WAChB,WAAW,KACrB,~~YAgIF~~,CAAC"}
1	+ {"version":3,"file":"findToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAI9C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,eAAO,MAAM,SAAS,WACV,iBAAiB,WAChB,WAAW,KACrB,YA2HF,CAAC"}

package/lib/queries/find/findToSql.js CHANGED Viewed

@@ -6,7 +6,7 @@ import { buildWhereClauses } from "../clauses/where/buildWhereClauses";
 import { hasConditions } from "../util/hasConditions";
 export const findToSql = (config, builder) => {
     const frag = new SQLStatement();
-    const [table, ...joinedTables] = builder.tables;
+    const table = builder.table;
     if (builder.lateralBy) {
         const { columns, groupTable, itemTable } = builder.lateralBy;
         frag.push(pgfmt(`SELECT %I.* FROM (\nSELECT `, itemTable));
@@ -21,23 +21,18 @@ export const findToSql = (config, builder) => {
         frag.push(pgfmt(`) %I\nJOIN LATERAL (\n`, groupTable));
     }
     frag.push(pgfmt(`SELECT\n${builder.columns.map((c) => pgfmt(`    %I.%I AS %I`, c.table, c.name, c.alias)).join(",\n")}`));
-    frag.push(pgfmt(`\nFROM %I.%I %I`, table.schema, table.name, table.alias));
-    for (const joinedTable of joinedTables) {
-        if (!joinedTable.joins)
-            throw new OrmError("Joined table without join clauses", {
-                data: builder,
-            });
-        frag.push(pgfmt("\nJOIN %I.%I %I\n    ON ", joinedTable.schema, joinedTable.name, joinedTable.alias));
-        frag.push(joinedTable.joins
-            .flatMap((join) => {
-            if (join.from.columns.length !== join.to.columns.length) {
-                throw new OrmError("Number of foreign keys doesn't match number of primary keys in join", { data: builder });
-            }
-            return join.from.columns.map((from, i) => pgfmt("%I.%I = %I.%I", table.alias, from, joinedTable.alias, join.to.columns[i]));
-        })
+    frag.push(pgfmt(`\nFROM %I.%I %I`, table.schema, table.table, table.alias));
+    for (const join of table.joins ?? []) {
+        if (join.from.columns.length !== join.to.columns.length) {
+            throw new OrmError("Number of foreign keys doesn't match number of primary keys in join", { data: builder });
+        }
+        frag.push(join.type === "left" ? "\nLEFT JOIN" : "\nJOIN");
+        frag.push(pgfmt(" %I.%I %I\n    ON ", join.to.schema, join.to.table, join.to.alias));
+        frag.push(join.from.columns
+            .map((from, i) => pgfmt("%I.%I = %I.%I", join.from.alias, from, join.to.alias, join.to.columns[i]))
             .join(" AND "));
-        if (hasConditions(joinedTable.where)) {
-            frag.push(sql `\n    AND ${buildWhereClauses(config, joinedTable, joinedTable.where)}`);
+        if (hasConditions(join.where)) {
+            frag.push(sql `\n    AND ${buildWhereClauses(config, join.to, join.where)}`);
         }
     }
     frag.push(sql `\nWHERE 1 = 1`);

package/lib/queries/find/findToSql.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"findToSql.js","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,MAAM,CAAC,MAAM,SAAS,GAAG,CACrB,MAAyB,EACzB,OAAoB,EACR,EAAE;IACd,MAAM,IAAI,GAAG,IAAI,YAAY,EAAE,CAAC;IAChC,MAAM,~~CAAC,~~KAAK,~~EAAE,~~GAAG,~~YAAY,CAAC,GAAG,~~OAAO,CAAC,~~MAAM~~,CAAC;~~IAEhD~~,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;YAElC,IAAI,CAAC,IAAI,CACL,GAAG,UAAU,CACT,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAA,GAAG,CAAC,EAAE,CAAC,EAC9B,GAAG,CAAA,IAAI,CACV,CACJ,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YAErD,IAAI,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,CAAC,IAAI,CACL,KAAK,CACD,WAAW,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC1G,CACJ,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,~~IAAI~~,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;~~IAE3E~~,KAAK,MAAM,~~WAAW~~,IAAI,~~YAAY~~,~~EAAE,~~CAAC~~;QACrC~~,IAAI,~~CAAC~~,~~WAAW~~,CAAC~~,KAAK~~;~~YAClB~~,~~MAAM~~,IAAI,~~QAAQ,~~CAAC,~~mCAAmC,EAAE;gBACpD,~~IAAI,~~EAAE~~,OAAO~~;aAChB~~,CAAC,~~CAAC;QACP~~,IAAI,CAAC,~~IAAI~~,~~CACL~~,~~KAAK~~,~~CACD~~,~~0BAA0B~~,~~EAC1B~~,~~WAAW,~~CAAC,MAAM,~~EAClB~~,~~WAAW~~,~~CAAC~~,IAAI,~~EAChB~~,~~WAAW~~,~~CAAC~~,~~KAAK,~~CACpB,~~CACJ~~,CAAC;~~QACF~~,IAAI,CAAC,IAAI,~~CACL~~,~~WAAW~~,CAAC,KAAK~~;aACZ~~,~~OAAO~~,CAAC,CAAC,~~IAAI~~,~~EAAE~~,~~EAAE;YACd~~,~~IAAI~~,~~IAAI~~,CAAC,IAAI,CAAC,~~OAAO~~,~~CAAC~~,~~MAAM,~~KAAK,~~IAAI~~,~~CAAC~~,~~EAAE~~,~~CAAC~~,~~OAAO,~~CAAC,~~MAAM,~~EAAE,CAAC~~;gBACtD~~,MAAM,IAAI,~~QAAQ~~,~~CACd~~,~~qEAAqE~~,~~EACrE~~,~~EAAE~~,IAAI,EAAE,~~OAAO~~,~~EAAE~~,~~CACpB~~,CAAC;~~YACN~~,CAAC~~;YAED~~,~~OAAO~~,IAAI,CAAC,IAAI,CAAC,OAAO,~~CAAC,~~GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,~~CACrC~~,KAAK,CACD,eAAe,EACf,~~KAAK~~,CAAC,KAAK,~~EACX~~,IAAI,EACJ,~~WAAW~~,CAAC,KAAK,~~EACjB~~,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CACrB,CACJ~~,CAAC~~;~~QACN~~,~~CAAC,CAAC;aACD,~~IAAI,CAAC,OAAO,CAAC,CACrB,CAAC;QACF,IAAI,aAAa,CAAC,~~WAAW~~,CAAC,KAAK,CAAC,EAAE,CAAC;~~YACnC~~,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,~~WAAW~~,EAAE,~~WAAW~~,CAAC,KAAK,CAAC,EAAE,~~CAC9E~~,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA,eAAe,CAAC,CAAC;IAE9B,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAClE,CAAC;IACN,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAClD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,IAAI,CAAC,IAAI,CACL,KAAK,CACD,yBAAyB,EACzB,KAAK,CAAC,KAAK,EACX,CAAC,CAAC,MAAM,EACR,UAAU,EACV,CAAC,CAAC,MAAM,CACX,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,CACL,OAAO,CAAC,OAAO;aACV,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAClC,KAAK,CACD,SAAS,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,EAC/C,KAAK,EACL,MAAM,CACT,CACJ;aACA,IAAI,CAAC,IAAI,CAAC,CAClB,CAAC;IACN,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA,WAAW,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA,YAAY,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
1	+ {"version":3,"file":"findToSql.js","sourceRoot":"","sources":["../../../src/queries/find/findToSql.ts"],"names":[],"mappings":"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"}

package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=findMany.nullable-relations.test.d.ts.map

package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"findMany.nullable-relations.test.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.nullable-relations.test.ts"],"names":[],"mappings":""}