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/migrate/commands/implode.js CHANGED Viewed

@@ -21,7 +21,7 @@ export const implode = async (db, { dryRun, output }) => {
             statement.push(createForeignKeyConstraintSql(model, foreignKey), "\n");
         }
     }
-    if (output)
+    if (output || process.env.ORM_VERBOSE_LOGGING)
         console.log(statement.text);
     if (!dryRun) {
         try {

package/lib/migrate/commands/implode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"implode.js","sourceRoot":"","sources":["../../../src/migrate/commands/implode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EACxB,EAAW,EACX,EAAE,MAAM,EAAE,MAAM,EAAwC,EAC1D,EAAE;IACA,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IAErC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3C,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAE9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC/C,SAAS,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;IACL,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,SAAS,CAAC,IAAI,CACV,6BAA6B,CAAC,KAAK,EAAE,UAAU,CAAC,EAChD,IAAI,CACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;~~IAExC~~,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;AACL,CAAC,CAAC"}
1	+ {"version":3,"file":"implode.js","sourceRoot":"","sources":["../../../src/migrate/commands/implode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EACxB,EAAW,EACX,EAAE,MAAM,EAAE,MAAM,EAAwC,EAC1D,EAAE;IACA,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;IAErC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACzC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3C,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAE9C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC/C,SAAS,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;IACL,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACzC,SAAS,CAAC,IAAI,CACV,6BAA6B,CAAC,KAAK,EAAE,UAAU,CAAC,EAChD,IAAI,CACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAE3E,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;AACL,CAAC,CAAC"}

package/lib/migrate/sql/createTableSql.test.js CHANGED Viewed

@@ -13,6 +13,7 @@ describe("createTableSql", () => {
             CREATE TABLE casekit."user" (
                 id uuid NOT NULL DEFAULT uuid_generate_v4(),
                 username text NOT NULL,
+                invited_by_id uuid,
                 created_at timestamp,
                 updated_at timestamp,
                 deleted_at timestamp,

package/lib/migrate/sql/createTableSql.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createTableSql.test.js","sourceRoot":"","sources":["../../../src/migrate/sql/createTableSql.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,GAAG,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAA~~;;;;;;;;;SAS3D~~,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG;YACT,KAAK;YACL,OAAO,EAAE;gBACL,EAAE,EAAE;oBACA,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;oBAC5B,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAA,oBAAoB;iBACnC;gBACD,KAAK,EAAE;oBACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;oBACrB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,eAAe;iBAC3B;gBACD,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBAChD,WAAW,EAAE;oBACT,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;oBACnB,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,IAAI;iBACjB;aACJ;SAC+B,CAAC;QACrC,MAAM,GAAG,CAAC;YACN,MAAM,EAAE,EAAE,IAAI,EAAE;YAChB,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;YAC7B,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE;SACtB,CAAC,CAAC,QAAQ,CACP,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CACpC,GAAG,CAAA,yBAAyB,CAAC,eAAe,CAAC,KAAK,CAAC,CACtD,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7C,IAAI;gBACJ,OAAO;gBACP,SAAS;gBACT,cAAc;aACjB,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"createTableSql.test.js","sourceRoot":"","sources":["../../../src/migrate/sql/createTableSql.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,GAAG,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAA;;;;;;;;;;SAU3D,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG;YACT,KAAK;YACL,OAAO,EAAE;gBACL,EAAE,EAAE;oBACA,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;oBAC5B,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAA,oBAAoB;iBACnC;gBACD,KAAK,EAAE;oBACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;oBACrB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,eAAe;iBAC3B;gBACD,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBAChD,WAAW,EAAE;oBACT,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;oBACnB,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,IAAI;iBACjB;aACJ;SAC+B,CAAC;QACrC,MAAM,GAAG,CAAC;YACN,MAAM,EAAE,EAAE,IAAI,EAAE;YAChB,SAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;YAC7B,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE;SACtB,CAAC,CAAC,QAAQ,CACP,KAAK,EAAE,EAAE,EAAE,EAAE;YACT,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,KAAK,CACpC,GAAG,CAAA,yBAAyB,CAAC,eAAe,CAAC,KAAK,CAAC,CACtD,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7C,IAAI;gBACJ,OAAO;gBACP,SAAS;gBACT,cAAc;aACjB,CAAC,CAAC;QACP,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/lib/orm.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orm.d.ts","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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~~CAYhB~~;AAED,eAAO,MAAM,GAAG,sGAIJ,cAAc,MAAM,EAAE,SAAS,CAAC,KACzC,IAAI,MAAM,EAAE,SAAS,CAIvB,CAAC"}
1	+ {"version":3,"file":"orm.d.ts","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}

package/lib/orm.js CHANGED Viewed

@@ -119,7 +119,7 @@ export class Orm {
     }
     async query(fragments, ...variables) {
         const query = sql(fragments, ...variables);
-        if (!process.env.CI) {
+        if (process.env.ORM_VERBOSE_LOGGING) {
             console.log(query.text);
             console.log(query.values);
         }
@@ -128,8 +128,10 @@ export class Orm {
     }
     async queryOne(fragments, ...variables) {
         const query = sql(fragments, ...variables);
-        if (!process.env.CI)
+        if (process.env.ORM_VERBOSE_LOGGING) {
             console.log(query.text);
+            console.log(query.values);
+        }
         const result = await this.connection.query(query);
         if (result.rowCount === 0 || result.rowCount === null)
             throw new OrmError("No rows returned from query");

package/lib/orm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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~~CAAC,~~OAAO,CAAC,GAAG,CAAC,~~EAAE~~,EAAE,CAAC;~~YAClB~~,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAI,KAAK,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,QAAQ,CACjB,SAA+B,EAC/B,GAAG,SAA6B;QAEhC,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAC3C,IAAI,~~CAAC,~~OAAO,CAAC,GAAG,CAAC,EAAE;~~YAAE~~,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;~~QAC7C~~,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAI,KAAK,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI;YACjD,MAAM,IAAI,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAEtD,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC;YACnB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,CAAC,CAAC;QAEhE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,CAIf,MAAwC,EAClB,EAAE;IACxB,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACtD,qBAAqB,CAAC,eAAe,CAAC,CAAC;IACvC,OAAO,IAAI,GAAG,CAAoB,eAAe,CAAC,CAAC;AACvD,CAAC,CAAC"}
1	+ {"version":3,"file":"orm.js","sourceRoot":"","sources":["../src/orm.ts"],"names":[],"mappings":"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"}

package/lib/queries/clauses/ReturningClause.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import { ColumnName } from "../../schema/types/helpers/ColumnName";
-import { ModelName } from "../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../schema/types/loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../../schema/types/loose/LooseModelDefinition";
 import { NonEmptyArray } from "../../types/util/NonEmptyArray";
-export type ReturningClause<Models extends LooseModelDefinitions, M extends ModelName<Models>> = NonEmptyArray<ColumnName<Models, M>>;
+export type ReturningClause<Model extends LooseModelDefinition> = NonEmptyArray<ColumnName<Model>>;
 //# sourceMappingURL=ReturningClause.d.ts.map

package/lib/queries/clauses/ReturningClause.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ReturningClause.d.ts","sourceRoot":"","sources":["../../../src/queries/clauses/ReturningClause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~sCAAsC,~~CAAC;~~AACjE~~,OAAO,EAAE,~~qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,~~aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,MAAM,eAAe,~~CACvB,MAAM,SAAS,qBAAqB,EACpC,~~CAAC,~~SAAS~~,SAAS,~~CAAC~~,~~MAAM~~,~~CAAC,IAC3B,~~aAAa,~~CAAC~~,UAAU,CAAC,~~MAAM~~,~~EAAE,~~CAAC,~~CAAC~~,CAAC~~,CAAC~~"}
1	+ {"version":3,"file":"ReturningClause.d.ts","sourceRoot":"","sources":["../../../src/queries/clauses/ReturningClause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,oBAAoB,IAAI,aAAa,CAC3E,UAAU,CAAC,KAAK,CAAC,CACpB,CAAC"}

package/lib/queries/clauses/SelectClause.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import { ColumnName } from "../../schema/types/helpers/ColumnName";
-import { ModelName } from "../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../schema/types/loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../../schema/types/loose/LooseModelDefinition";
 import { NonEmptyArray } from "../../types/util/NonEmptyArray";
-export type SelectClause<Models extends LooseModelDefinitions, M extends ModelName<Models>> = NonEmptyArray<ColumnName<Models, M>>;
+export type SelectClause<Model extends LooseModelDefinition> = NonEmptyArray<ColumnName<Model>>;
 //# sourceMappingURL=SelectClause.d.ts.map

package/lib/queries/clauses/SelectClause.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SelectClause.d.ts","sourceRoot":"","sources":["../../../src/queries/clauses/SelectClause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~sCAAsC,~~CAAC;~~AACjE~~,OAAO,EAAE,~~qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,~~aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,MAAM,YAAY,~~CACpB,MAAM,SAAS,qBAAqB,EACpC,~~CAAC,~~SAAS~~,SAAS,~~CAAC~~,~~MAAM~~,~~CAAC,IAC3B,~~aAAa,~~CAAC~~,UAAU,CAAC,~~MAAM~~,~~EAAE,~~CAAC,~~CAAC~~,CAAC~~,CAAC~~"}
1	+ {"version":3,"file":"SelectClause.d.ts","sourceRoot":"","sources":["../../../src/queries/clauses/SelectClause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,MAAM,YAAY,CAAC,KAAK,SAAS,oBAAoB,IAAI,aAAa,CACxE,UAAU,CAAC,KAAK,CAAC,CACpB,CAAC"}

package/lib/queries/clauses/WhereClause.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../schema/types/loose/LooseModelDefini
 import { $and, $not, $or } from "../clauses/where/operators";
 import { WhereClauseValue } from "./where/types/WhereClauseValue";
 export type WhereClause<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
-    [C in ColumnName<Models, M>]?: WhereClauseValue<Models, M, C>;
+    [C in ColumnName<Models[M]>]?: WhereClauseValue<Models, M, C>;
 } & {
     [$and]?: WhereClause<Models, M>[];
     [$or]?: WhereClause<Models, M>[];

package/lib/queries/clauses/WhereClause.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"WhereClause.d.ts","sourceRoot":"","sources":["../../../src/queries/clauses/WhereClause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,MAAM,MAAM,WAAW,CACnB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;KACC,CAAC,IAAI,UAAU,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAChE,GAAG;IACA,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClC,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IACjC,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CACnC,CAAC"}
1	+ {"version":3,"file":"WhereClause.d.ts","sourceRoot":"","sources":["../../../src/queries/clauses/WhereClause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,MAAM,MAAM,WAAW,CACnB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;KACC,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAChE,GAAG;IACA,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IAClC,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;IACjC,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CACnC,CAAC"}

package/lib/queries/clauses/helpers/OptionalColumn.d.ts CHANGED Viewed

@@ -3,9 +3,8 @@ import { HasDefault } from "../../../schema/types/helpers/HasDefault";
 import { IsNullable } from "../../../schema/types/helpers/IsNullable";
 import { IsProvided } from "../../../schema/types/helpers/IsProvided";
 import { IsSerial } from "../../../schema/types/helpers/IsSerial";
-import { ModelName } from "../../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
-export type OptionalColumn<Models extends LooseModelDefinitions, M extends ModelName<Models>> = {
-    [C in ColumnName<Models, M>]: IsNullable<Models, M, C> extends true ? C : IsSerial<Models, M, C> extends true ? C : HasDefault<Models, M, C> extends true ? C : IsProvided<Models, M, C> extends true ? C : never;
-}[ColumnName<Models, M>];
+import { LooseModelDefinition } from "../../../schema/types/loose/LooseModelDefinition";
+export type OptionalColumn<Model extends LooseModelDefinition> = {
+    [C in ColumnName<Model>]: IsNullable<Model, C> extends true ? C : IsSerial<Model, C> extends true ? C : HasDefault<Model, C> extends true ? C : IsProvided<Model, C> extends true ? C : never;
+}[ColumnName<Model>];
 //# sourceMappingURL=OptionalColumn.d.ts.map

package/lib/queries/clauses/helpers/OptionalColumn.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OptionalColumn.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/OptionalColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~yCAAyC~~,CAAC;~~AACpE~~,~~OAAO,EAAE,qBAAqB,EAAE,~~MAAM,~~mDAAmD,CAAC;AAE1F,~~MAAM,~~MAAM,~~cAAc,~~CACtB,MAAM,SAAS,qBAAqB,EACpC,~~CAAC,~~SAAS~~,SAAS,~~CAAC~~,~~MAAM,CAAC,IAC3B~~;~~KACC~~,CAAC,IAAI,UAAU,CAAC,~~MAAM~~,~~EAAE,~~CAAC,~~CAAC,~~GAAG,UAAU,CAAC,~~MAAM~~,EAAE,CAAC,~~EAAE,~~CAAC,~~CAAC,~~SAAS,IAAI,~~GAC7D~~,CAAC,GACD,QAAQ,CAAC,~~MAAM~~,EAAE,CAAC,~~EAAE,~~CAAC,~~CAAC,~~SAAS,IAAI,~~GACjC~~,CAAC,GACD,UAAU,CAAC,~~MAAM~~,EAAE,CAAC,~~EAAE,~~CAAC,~~CAAC,~~SAAS,IAAI,~~GACnC~~,CAAC,GACD,UAAU,CAAC,~~MAAM~~,EAAE,CAAC,~~EAAE,~~CAAC,~~CAAC,~~SAAS,IAAI,~~GACnC~~,CAAC,GACD,KAAK;CACpB,CAAC,UAAU,CAAC,~~MAAM~~,~~EAAE,~~CAAC,CAAC,CAAC~~,CAAC~~"}
1	+ {"version":3,"file":"OptionalColumn.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/OptionalColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AAExF,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,oBAAoB,IAAI;KAC5D,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,IAAI,GACrD,CAAC,GACD,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,IAAI,GAC7B,CAAC,GACD,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,IAAI,GAC/B,CAAC,GACD,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,IAAI,GAC/B,CAAC,GACD,KAAK;CACpB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC"}

package/lib/queries/clauses/helpers/OptionalParams.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { ColumnType } from "../../../schema/types/helpers/ColumnType";
 import { ModelName } from "../../../schema/types/helpers/ModelName";
 import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
 import { OptionalColumn } from "./OptionalColumn";
-export type OptionalParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = OptionalColumn<Models, M> extends never ? unknown : {
-    [C in OptionalColumn<Models, M>]?: ColumnType<Models, M, C>;
+export type OptionalParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = OptionalColumn<Models[M]> extends never ? unknown : {
+    [C in OptionalColumn<Models[M]>]?: ColumnType<Models, M, C>;
 };
 //# sourceMappingURL=OptionalParams.d.ts.map

package/lib/queries/clauses/helpers/OptionalParams.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OptionalParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/OptionalParams.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,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAE3B,cAAc,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,SAAS,KAAK,GACjC,OAAO,GACP;KACK,CAAC,IAAI,cAAc,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC9D,CAAC"}
1	+ {"version":3,"file":"OptionalParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/OptionalParams.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,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAE3B,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,GACjC,OAAO,GACP;KACK,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC9D,CAAC"}

package/lib/queries/clauses/helpers/RequiredColumn.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import { ColumnName } from "../../../schema/types/helpers/ColumnName";
-import { ModelName } from "../../../schema/types/helpers/ModelName";
-import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
+import { LooseModelDefinition } from "../../../schema/types/loose/LooseModelDefinition";
 import { OptionalColumn } from "./OptionalColumn";
-export type RequiredColumn<Models extends LooseModelDefinitions, M extends ModelName<Models>> = Exclude<ColumnName<Models, M>, OptionalColumn<Models, M>>;
+export type RequiredColumn<Model extends LooseModelDefinition> = Exclude<ColumnName<Model>, OptionalColumn<Model>>;
 //# sourceMappingURL=RequiredColumn.d.ts.map

package/lib/queries/clauses/helpers/RequiredColumn.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RequiredColumn.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/RequiredColumn.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,~~cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,cAAc,~~CACtB,MAAM,SAAS,qBAAqB,EACpC,~~CAAC,~~SAAS~~,SAAS,~~CAAC~~,~~MAAM~~,~~CAAC,IAC3B,~~OAAO,~~CAAC~~,UAAU,CAAC,~~MAAM~~,~~EAAE,~~CAAC,~~CAAC~~,~~EAAE,~~cAAc,CAAC,~~MAAM~~,~~EAAE,~~CAAC,~~CAAC~~,CAAC~~,CAAC~~"}
1	+ {"version":3,"file":"RequiredColumn.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/RequiredColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,oBAAoB,IAAI,OAAO,CACpE,UAAU,CAAC,KAAK,CAAC,EACjB,cAAc,CAAC,KAAK,CAAC,CACxB,CAAC"}

package/lib/queries/clauses/helpers/RequiredParams.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { ColumnType } from "../../../schema/types/helpers/ColumnType";
 import { ModelName } from "../../../schema/types/helpers/ModelName";
 import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
 import { RequiredColumn } from "./RequiredColumn";
-export type RequiredParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = RequiredColumn<Models, M> extends never ? unknown : {
-    [C in RequiredColumn<Models, M>]: ColumnType<Models, M, C>;
+export type RequiredParams<Models extends LooseModelDefinitions, M extends ModelName<Models>> = RequiredColumn<Models[M]> extends never ? unknown : {
+    [C in RequiredColumn<Models[M]>]: ColumnType<Models, M, C>;
 };
 //# sourceMappingURL=RequiredParams.d.ts.map

package/lib/queries/clauses/helpers/RequiredParams.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RequiredParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/RequiredParams.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,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAE3B,cAAc,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,SAAS,KAAK,GACjC,OAAO,GACP;KACK,CAAC,IAAI,cAAc,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC7D,CAAC"}
1	+ {"version":3,"file":"RequiredParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/helpers/RequiredParams.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,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAE3B,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,GACjC,OAAO,GACP;KACK,CAAC,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;CAC7D,CAAC"}

package/lib/queries/clauses/where/buildWhereClauses.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
 import { SQLStatement } from "../../../sql";
 import { WhereClause } from "../WhereClause";
 export declare const buildWhereClauses: (config: BaseConfiguration, table: {
-    name: string;
+    table: string;
     schema: string;
     alias: string;
     model: string;

package/lib/queries/clauses/where/buildWhereClauses.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildWhereClauses.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAO,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,iBAAiB,WAClB,iBAAiB,SAClB;IAAE,~~IAAI~~,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,~~SAC9D~~,YAAY,qBAAqB,EAAE,UAAU,qBAAqB,CAAC,CAAC,KAC5E,YAgCF,CAAC"}
1	+ {"version":3,"file":"buildWhereClauses.d.ts","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAO,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,iBAAiB,WAClB,iBAAiB,SAClB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,SAC/D,YAAY,qBAAqB,EAAE,UAAU,qBAAqB,CAAC,CAAC,KAC5E,YAgCF,CAAC"}

package/lib/queries/clauses/where/buildWhereClauses.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildWhereClauses.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,GAAG,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,MAAyB,EACzB,~~KAAqE~~,~~EACrE~~,KAA2E,EAC/D,EAAE;IACd,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,OAAO,CAAC,IAAI,CACR,gBAAgB,CACZ,KAAK,CAAC,KAAK,EACX,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EACrD,KAAK,CACR,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC7C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,OAAO,UAAU,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;AACjD,CAAC,CAAC"}
1	+ {"version":3,"file":"buildWhereClauses.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,GAAG,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC7B,MAAyB,EACzB,KAAsE,EACtE,KAA2E,EAC/D,EAAE;IACd,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,OAAO,CAAC,IAAI,CACR,gBAAgB,CACZ,KAAK,CAAC,KAAK,EACX,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EACrD,KAAK,CACR,CACJ,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC7C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,OAAO,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,OAAO,UAAU,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAA,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;AACjD,CAAC,CAAC"}

package/lib/queries/clauses/where/buildWhereClauses.test.js CHANGED Viewed

@@ -104,7 +104,7 @@ describe("buildWhereClauses", () => {
             [1, 2, 3],
         ],
     ])("Where clause of %s returns SQL %s with variables %s", (where, sql, values) => {
-        const clause = buildWhereClauses(db.config, { name: "foo", schema: "casekit", model: "foo", alias: "a" }, where);
+        const clause = buildWhereClauses(db.config, { table: "foo", schema: "casekit", model: "foo", alias: "a" }, where);
         expect(clause.text).toEqual(sql);
         expect(clause.values).toEqual(values);
     });

package/lib/queries/clauses/where/buildWhereClauses.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildWhereClauses.test.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAIhD,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACH,IAAI,EACJ,GAAG,EACH,GAAG,EACH,IAAI,EACJ,MAAM,EACN,GAAG,EACH,GAAG,EACH,KAAK,EACL,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,GAAG,GACN,MAAM,aAAa,CAAC;AAErB;;;;GAIG;AACH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,IAAI,CAAC;QACN,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC;QACrC;YACI,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC9C,oBAAoB;YACpB,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACzB;QACD;YACI,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC/C,qBAAqB;YACrB,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACzB;QACD,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;QACpD;YACI,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC/C,qBAAqB;YACrB,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SACzB;QAED,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,6BAA6B,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACnE;YACI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE;YACpC,gCAAgC;YAChC,CAAC,CAAC,EAAE,MAAM,CAAC;SACd;QACD;YACI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE;YACrC,iCAAiC;YACjC,CAAC,CAAC,EAAE,MAAM,CAAC;SACd;QACD;YACI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,EAAE;YACrC,8BAA8B;YAC9B,CAAC,CAAC,EAAE,SAAS,CAAC;SACjB;QACD;YACI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE;YACjC,oCAAoC;YACpC,CAAC,CAAC,CAAC;SACN;QACD;YACI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE;YAChC,8BAA8B;YAC9B,CAAC,CAAC,EAAE,IAAI,CAAC;SACZ;QACD;YACI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;YACxC,mCAAmC;YACnC,CAAC,CAAC,EAAE,KAAK,CAAC;SACb;QACD;YACI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;YACvC,kCAAkC;YAClC,CAAC,CAAC,EAAE,KAAK,CAAC;SACb;QACD;YACI,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACzD,0CAA0C;YAC1C,CAAC,KAAK,EAAE,KAAK,CAAC;SACjB;QACD;YACI,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE;YAC3C,0BAA0B;YAC1B,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC;SACzB;QACD,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE,CAAC;QACnD;YACI;gBACI,CAAC,IAAI,CAAC,EAAE;oBACJ,CAAC,IAAI,CAAC,EAAE;wBACJ,EAAE,IAAI,EAAE,KAAK,EAAE;wBACf;4BACI,CAAC,GAAG,CAAC,EAAE;gCACH;oCACI,CAAC,IAAI,CAAC,EAAE;wCACJ,EAAE,IAAI,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE;wCAC7B,EAAE,aAAa,EAAE,CAAC,EAAE;qCACvB;iCACJ;gCACD,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE;gCAC9C,EAAE,aAAa,EAAE,GAAG,EAAE;6BACzB;yBACJ;qBACJ;iBACJ;aACJ;YACD,gLAAgL;YAChL,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;SAC9B;QACD;YACI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;YACvD,6DAA6D;YAC7D,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACZ;KACJ,CAAC,CACE,qDAAqD,EACrD,CACI,KAGC,EACD,GAAW,EACX,MAAiB,EACnB,EAAE;QACA,MAAM,MAAM,GAAG,iBAAiB,CAC5B,EAAE,CAAC,MAAM,EACT,EAAE,~~IAAI~~,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,~~EAC5D~~,KAAK,CACR,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC,CACJ,CAAC;AACN,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"buildWhereClauses.test.js","sourceRoot":"","sources":["../../../../src/queries/clauses/where/buildWhereClauses.test.ts"],"names":[],"mappings":"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"}

package/lib/queries/clauses/where/types/WhereClauseValue.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ColumnType } from "../../../../schema/types/helpers/ColumnType";
 import { ModelName } from "../../../../schema/types/helpers/ModelName";
 import { LooseModelDefinitions } from "../../../../schema/types/loose/LooseModelDefinitions";
 import { $eq, $gt, $gte, $ilike, $in, $is, $like, $lt, $lte, $ne, $not } from "../operators";
-export type WhereClauseValue<Models extends LooseModelDefinitions, M extends ModelName<Models>, C extends ColumnName<Models, M>, T = ColumnType<Models, M, C>> = ColumnType<Models, M, C> | null | {
+export type WhereClauseValue<Models extends LooseModelDefinitions, M extends ModelName<Models>, C extends ColumnName<Models[M]>, T = ColumnType<Models, M, C>> = ColumnType<Models, M, C> | null | {
     [$eq]?: T;
     [$ne]?: T;
     [$not]?: null;

package/lib/queries/clauses/where/types/WhereClauseValue.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"WhereClauseValue.d.ts","sourceRoot":"","sources":["../../../../../src/queries/clauses/where/types/WhereClauseValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAC7F,OAAO,EACH,GAAG,EACH,GAAG,EACH,IAAI,EACJ,MAAM,EACN,GAAG,EACH,GAAG,EACH,KAAK,EACL,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACP,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,UAAU,CAAC,MAAM,~~EAAE~~,CAAC,CAAC,EAC/B,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,IAE1B,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,GACxB,IAAI,GACJ;IACI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC;IACd,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG;QAAE,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,CAAC;IACvD,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IACX,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IACX,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACZ,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC"}
1	+ {"version":3,"file":"WhereClauseValue.d.ts","sourceRoot":"","sources":["../../../../../src/queries/clauses/where/types/WhereClauseValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAC7F,OAAO,EACH,GAAG,EACH,GAAG,EACH,IAAI,EACJ,MAAM,EACN,GAAG,EACH,GAAG,EACH,KAAK,EACL,GAAG,EACH,IAAI,EACJ,GAAG,EACH,IAAI,EACP,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,gBAAgB,CACxB,MAAM,SAAS,qBAAqB,EACpC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAC/B,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,IAE1B,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,GACxB,IAAI,GACJ;IACI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC;IACd,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG;QAAE,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,CAAC;IACvD,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IACX,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IACX,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACZ,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC"}

package/lib/queries/count/buildCount.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildCount.d.ts","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,KACtB,MAAM,SACF,eAAe,SAChB,MAAM,EAAE,2BAEf,~~YAyDF~~,CAAC"}
1	+ {"version":3,"file":"buildCount.d.ts","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,KACtB,MAAM,SACF,eAAe,SAChB,MAAM,EAAE,2BAEf,YA+DF,CAAC"}

package/lib/queries/count/buildCount.js CHANGED Viewed

@@ -2,43 +2,47 @@ import { ensureArray } from "../../util/ensureArray";
 import { tableAlias } from "../util/tableAlias";
 export const buildCount = (config, m, query, path = [], _tableIndex = 0) => {
     const builder = {
+        table: {
+            table: config.models[m]["table"],
+            model: m,
+            schema: config.models[m]["schema"],
+            alias: tableAlias(_tableIndex++),
+            joins: [],
+            where: config.middleware.count?.where
+                ? config.middleware.count.where(query.where, {
+                    config,
+                    model: m,
+                })
+                : query.where,
+        },
         tableIndex: _tableIndex,
-        tables: [],
     };
     const model = config.models[m];
-    const alias = tableAlias(builder.tableIndex++);
-    builder.tables.push({
-        name: config.models[m]["table"],
-        model: m,
-        schema: config.models[m]["schema"],
-        alias: alias,
-        where: config.middleware.count?.where
-            ? config.middleware.count.where(query.where, { config, model: m })
-            : query.where,
-    });
+    const alias = builder.table.alias;
     for (const [r, subquery] of Object.entries(query.include ?? {})) {
         const relation = config.relations[m][r];
         const joinedModel = config.models[relation.model];
         if (relation.type === "N:1") {
             const joinBuilder = buildCount(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),
-                        },
-                    },
-                ],
-            });
-            builder.tables.push(...otherTables);
+            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),
+                },
+                where: joinedTable.where,
+                type: relation.optional ? "left" : "inner",
+            }, ...joinedTable.joins);
         }
     }
     return builder;

package/lib/queries/count/buildCount.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildCount.js","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,MAAM,CAAC,MAAM,UAAU,GAAG,CACtB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACtB,OAAiB,EAAE,EACnB,WAAW,GAAG,CAAC,EACH,EAAE;IACd,MAAM,OAAO,GAAiB;QAC1B,~~UAAU~~,EAAE~~,WAAW~~;~~QACvB~~,~~MAAM~~,EAAE,~~EAAE;KACb,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~~;~~IAE/C~~,~~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,KAAK,EAAE,KAAK;~~YACjC~~,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,~~EAAE,~~MAAM,~~EAAE,~~KAAK,EAAE,CAAC,EAAE,CAAC;~~YAClE~~,CAAC,CAAC,KAAK,CAAC,KAAK~~;KACpB~~,CAAC,CAAC;~~IAEH~~,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,UAAU,CAC1B,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~~,~~OAAO~~,CAAC,MAAM,CAAC,~~IAAI~~,CAAC,GAAG,WAAW,CAAC,CAAC;~~QACxC~~,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC"}
1	+ {"version":3,"file":"buildCount.js","sourceRoot":"","sources":["../../../src/queries/count/buildCount.ts"],"names":[],"mappings":"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"}

package/lib/queries/count/countToSql.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"countToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/count/countToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,WAChB,YAAY,KACtB,~~YA0DF~~,CAAC"}
1	+ {"version":3,"file":"countToSql.d.ts","sourceRoot":"","sources":["../../../src/queries/count/countToSql.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAO,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,UAAU,WACX,iBAAiB,WAChB,YAAY,KACtB,YAqDF,CAAC"}

package/lib/queries/count/countToSql.js CHANGED Viewed

@@ -4,25 +4,20 @@ import { sql } from "../../sql";
 import { buildWhereClauses } from "../clauses/where/buildWhereClauses";
 import { hasConditions } from "../util/hasConditions";
 export const countToSql = (config, builder) => {
-    const [table, ...joinedTables] = builder.tables;
+    const table = builder.table;
     const frag = sql `SELECT count(1) as "count"`;
-    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("\n %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/count/countToSql.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"countToSql.js","sourceRoot":"","sources":["../../../src/queries/count/countToSql.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,UAAU,GAAG,CACtB,MAAyB,EACzB,OAAqB,EACT,EAAE;IACd,MAAM,~~CAAC,~~KAAK,~~EAAE,~~GAAG,~~YAAY,CAAC,GAAG,~~OAAO,CAAC,~~MAAM~~,CAAC;~~IAEhD~~,MAAM,IAAI,GAAG,GAAG,CAAA,4BAA4B,CAAC;IAE7C,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,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
1	+ {"version":3,"file":"countToSql.js","sourceRoot":"","sources":["../../../src/queries/count/countToSql.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,UAAU,GAAG,CACtB,MAAyB,EACzB,OAAqB,EACT,EAAE;IACd,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,MAAM,IAAI,GAAG,GAAG,CAAA,4BAA4B,CAAC;IAE7C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE5E,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;QACnC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACtD,MAAM,IAAI,QAAQ,CACd,qEAAqE,EACrE,EAAE,IAAI,EAAE,OAAO,EAAE,CACpB,CAAC;QACN,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CACL,KAAK,CACD,sBAAsB,EACtB,IAAI,CAAC,EAAE,CAAC,MAAM,EACd,IAAI,CAAC,EAAE,CAAC,KAAK,EACb,IAAI,CAAC,EAAE,CAAC,KAAK,CAChB,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,CACL,IAAI,CAAC,IAAI,CAAC,OAAO;aACZ,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACb,KAAK,CACD,eAAe,EACf,IAAI,CAAC,IAAI,CAAC,KAAK,EACf,IAAI,EACJ,IAAI,CAAC,EAAE,CAAC,KAAK,EACb,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CACrB,CACJ;aACA,IAAI,CAAC,OAAO,CAAC,CACrB,CAAC;QACF,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CACL,GAAG,CAAA,aAAa,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CACnE,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,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}

package/lib/queries/count/types/CountBuilder.d.ts CHANGED Viewed

@@ -3,24 +3,32 @@ import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDef
 import { WhereClause } from "../../clauses/WhereClause";
 export type CountBuilder = {
     tableIndex: number;
-    tables: {
-        name: string;
+    table: {
+        table: string;
         model: string;
         schema: string;
         alias: string;
-        joins?: Join[];
+        joins: Join[];
         conditions?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
         where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
-    }[];
+    };
 };
 export type Join = {
     from: {
+        schema: string;
         table: string;
+        alias: string;
+        model: string;
         columns: string[];
     };
     to: {
+        schema: string;
         table: string;
+        alias: string;
+        model: string;
         columns: string[];
     };
+    where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
+    type?: "inner" | "left";
 };
 //# sourceMappingURL=CountBuilder.d.ts.map

package/lib/queries/count/types/CountBuilder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CountBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/count/types/CountBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,~~MAAM~~,EAAE;~~QACJ~~,~~IAAI~~,EAAE,MAAM,CAAC;~~QACb~~,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,~~CAAC,~~EAAE,IAAI,EAAE,CAAC;~~QACf~~,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,~~EAAE,~~CAAC;~~CACP~~,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;~~QAAE~~,KAAK,EAAE,MAAM,CAAC;~~QAAC~~,OAAO,EAAE,MAAM,EAAE,~~CAAA~~;~~KAAE~~,CAAC;~~IAC3C~~,EAAE,EAAE;~~QAAE~~,KAAK,EAAE,MAAM,CAAC;~~QAAC~~,OAAO,EAAE,MAAM,EAAE,~~CAAA~~;~~KAAE~~,CAAC;~~CAC5C~~,CAAC"}
1	+ {"version":3,"file":"CountBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/count/types/CountBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB,KAAK,EAAE;QACH,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QACF,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,EAAE,EAAE;QACA,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC3B,CAAC"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,eAAO,MAAM,KAAK,SACR,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,eAAe,~~iBAiBzB~~,CAAC"}
1	+ {"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,eAAO,MAAM,KAAK,SACR,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,eAAe,iBAoBzB,CAAC"}

package/lib/queries/count.js CHANGED Viewed

@@ -9,8 +9,10 @@ export const count = async (conn, config, m, query) => {
         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)
         .then((result) => result.rows[0].count);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACtB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACxB,EAAE;IACA,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,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;SACpB,KAAK,CAAC,SAAS,CAAC;SAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}
1	+ {"version":3,"file":"count.js","sourceRoot":"","sources":["../../src/queries/count.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EACtB,IAAgB,EAChB,MAAyB,EACzB,CAAS,EACT,KAAsB,EACxB,EAAE;IACA,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC;QACR,OAAO,EAAE,iBAAiB;QAC1B,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;SACpB,KAAK,CAAC,SAAS,CAAC;SAChB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC"}

package/lib/queries/create/buildCreate.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { BaseCreateManyParams } from "./types/BaseCreateManyParams";
 export type CreateBuilder = {
     tableIndex: number;
     table: {
-        name: string;
+        table: string;
         schema: string;
     };
     params: {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"buildCreate.d.ts","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,~~IAAI~~,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;~~IACxC~~,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,EAAE,CAAC;IAC5D,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,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,oBAAoB,2BAE7B,aA6CF,CAAC"}
1	+ {"version":3,"file":"buildCreate.d.ts","sourceRoot":"","sources":["../../../src/queries/create/buildCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,EAAE,CAAC;IAC5D,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,CAAC;IAC/B,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,oBAAoB,2BAE7B,aA6CF,CAAC"}