@stamhoofd/sql 2.89.1 → 2.90.0

package/dist/tests/utils/index.js

@@ -10,17 +10,17 @@ exports.createTableDefinition = createTableDefinition;
 exports.testMatch = testMatch;
 const simple_database_1 = require("@simonbackx/simple-database");
 const test_utils_1 = require("@stamhoofd/test-utils");
-const SQLModernFilter_1 = require("../../src/filters/modern/SQLModernFilter");
+const SQLFilter_1 = require("../../src/filters/SQLFilter");
 const SQL_1 = require("../../src/SQL");
 const SQLWhere_1 = require("../../src/SQLWhere");
 async function testError({ filter, filters, error }) {
-    await expect((0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters)).rejects.toThrow(error);
+    await expect((0, SQLFilter_1.compileToSQLFilter)(filter, filters)).rejects.toThrow(error);
 }
 /**
  * Only compares the WHERE clause of the query.
  */
 async function test({ filter, filters, query }) {
-    const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+    const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
     if (where.isAlways === false) {
         doesQueryMatch('', query);
         return;
@@ -39,7 +39,7 @@ async function test({ filter, filters, query }) {
  * Use to also test joins. This will use `test_table` as the table name in your query.
  */
 async function testSelect({ filter, filters, query }) {
-    const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+    const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
     if (where.isAlways === false) {
         doesQueryMatch('', query);
         return;
@@ -147,7 +147,7 @@ async function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }
     // Run queries
     try {
         for (const filter of doMatch ?? []) {
-            const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+            const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
             const select = SQL_1.SQL.select().from(tableName).where(where);
             let results;
             try {
@@ -168,7 +168,7 @@ async function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }
             }).toMatchSnapshot('SQL Query for filter: ' + JSON.stringify(filter));
         }
         for (const filter of doNotMatch ?? []) {
-            const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+            const where = await (0, SQLFilter_1.compileToSQLFilter)(filter, filters);
             const select = SQL_1.SQL.select().from(tableName).where(where);
             let results;
             try {

package/dist/tests/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../tests/utils/index.ts"],"names":[],"mappings":"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"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/queryablemodel.ts","../src/sql.ts","../src/sqldelete.ts","../src/sqlexpression.ts","../src/sqlexpressions.ts","../src/sqlinsert.ts","../src/sqljoin.ts","../src/sqljsonexpressions.ts","../src/sqlorderby.ts","../src/sqlselect.ts","../src/sqlupdate.ts","../src/sqlwhere.ts","../src/filters/sqlfilter.ts","../src/filters/sqlsorter.ts","../src/filters/modern/sqlmodernfilter.ts","../src/filters/modern/compilers/contains.ts","../src/filters/modern/compilers/equals.ts","../src/filters/modern/compilers/greater.ts","../src/filters/modern/compilers/in.ts","../src/filters/modern/compilers/index.ts","../src/filters/modern/compilers/less.ts","../src/filters/modern/helpers/isjsoncolumn.ts","../src/filters/modern/helpers/normalizecomparevalue.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../tests/filters/$and.test.ts","../tests/filters/$contains.test.ts","../tests/filters/$eq.test.ts","../tests/filters/$gt.test.ts","../tests/filters/$gte.test.ts","../tests/filters/$in.test.ts","../tests/filters/$lt.test.ts","../tests/filters/$lte.test.ts","../tests/filters/$neq.test.ts","../tests/filters/$not.test.ts","../tests/filters/$or.test.ts","../tests/filters/dot-syntax.test.ts","../tests/filters/exists.test.ts","../tests/filters/joined-relations.test.ts","../tests/filters/special-cases.test.ts","../tests/filters/wildcard.test.ts","../tests/utils/index.ts","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.8.3"}
+{"root":["../src/queryablemodel.ts","../src/sql.ts","../src/sqldelete.ts","../src/sqlexpression.ts","../src/sqlexpressions.ts","../src/sqlinsert.ts","../src/sqljoin.ts","../src/sqljsonexpressions.ts","../src/sqlorderby.ts","../src/sqlselect.ts","../src/sqlupdate.ts","../src/sqlwhere.ts","../src/filters/sqlfilter.ts","../src/filters/sqlsorter.ts","../src/filters/compilers/contains.ts","../src/filters/compilers/equals.ts","../src/filters/compilers/greater.ts","../src/filters/compilers/in.ts","../src/filters/compilers/index.ts","../src/filters/compilers/less.ts","../src/filters/helpers/isjsoncolumn.ts","../src/filters/helpers/normalizecomparevalue.ts","../tests/jest.global.setup.ts","../tests/jest.setup.ts","../tests/filters/$and.test.ts","../tests/filters/$contains.test.ts","../tests/filters/$eq.test.ts","../tests/filters/$gt.test.ts","../tests/filters/$gte.test.ts","../tests/filters/$in.test.ts","../tests/filters/$lt.test.ts","../tests/filters/$lte.test.ts","../tests/filters/$neq.test.ts","../tests/filters/$not.test.ts","../tests/filters/$or.test.ts","../tests/filters/dot-syntax.test.ts","../tests/filters/exists.test.ts","../tests/filters/joined-relations.test.ts","../tests/filters/special-cases.test.ts","../tests/filters/wildcard.test.ts","../tests/utils/index.ts","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/sql",
-    "version": "2.89.1",
+    "version": "2.90.0",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "license": "UNLICENCED",
@@ -16,5 +16,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "538a0e198d2db14c1e7650c75a645113b4394e71"
+    "gitHead": "d360b2ce795e378363765863457cd595f4841b73"
 }

package/src/SQLJsonExpressions.ts

@@ -206,6 +206,11 @@ export class SQLJsonContains extends SQLWhere {
             ')',
         ]);
     }
+
+    clone(): this {
+        const c = (new (this.constructor as any)(this.target, this.candidate, this.path)) as this;
+        return c;
+    }
 }
 
 /**
@@ -230,6 +235,11 @@ export class SQLJsonOverlaps extends SQLWhere {
             ')',
         ]);
     }
+
+    clone(): this {
+        const c = (new (this.constructor as any)(this.jsonDoc1, this.jsonDoc2)) as this;
+        return c;
+    }
 }
 
 export class SQLLpad implements SQLExpression {

package/src/SQLSelect.ts

@@ -55,6 +55,7 @@ export class SQLSelect<T extends object = SQLResultNamespacedRow> extends Wherea
     clone(): this {
         const c = new SQLSelect(...this._columns);
         Object.assign(c, this);
+        this._where = this._where ? this._where.clone() : null;
         return c as any;
     }
 
@@ -232,6 +233,10 @@ export class SQLSelect<T extends object = SQLResultNamespacedRow> extends Wherea
     }
 
     async count(): Promise<number> {
+        if (this._where && this._where.isAlways === false) {
+            return 0;
+        }
+
         this._columns = [
             new SQLSelectAs(
                 new SQLCount(),
@@ -263,6 +268,10 @@ export class SQLSelect<T extends object = SQLResultNamespacedRow> extends Wherea
     }
 
     async sum(expression: SQLExpression): Promise<number> {
+        if (this._where && this._where.isAlways === false) {
+            return 0;
+        }
+
         this._columns = [
             new SQLSelectAs(
                 new SQLSum(expression),

package/src/SQLWhere.ts

@@ -138,6 +138,8 @@ export abstract class SQLWhere implements SQLExpression {
     getJoins(): SQLJoin[] {
         return [];
     }
+
+    abstract clone(): this;
 }
 
 export class SQLEmptyWhere extends SQLWhere {
@@ -168,6 +170,10 @@ export class SQLEmptyWhere extends SQLWhere {
     get isAlways() {
         return true;
     }
+
+    clone(): this {
+        return new SQLEmptyWhere() as this;
+    }
 }
 
 export class SQLWhereEqual extends SQLWhere {
@@ -325,9 +331,25 @@ export class SQLWhereEqual extends SQLWhere {
             ]);
         }
 
+        let sign = this.sign as string;
+        if (this.sign === SQLWhereSign.Equal && this.nullable) {
+            // Swap with null-safe equal
+            sign = '<=>';
+        }
+        else if (this.sign === SQLWhereSign.NotEqual && this.nullable) {
+            // Swap with null-safe not equal
+            return joinSQLQuery([
+                'NOT (',
+                this.column.getSQL(options),
+                ` <=> `,
+                this.value.getSQL(options),
+                ')',
+            ]);
+        }
+
         return joinSQLQuery([
             this.column.getSQL(options),
-            ` ${this.sign} `,
+            ` ${sign} `,
             this.value.getSQL(options),
         ]);
     }
@@ -529,6 +551,12 @@ export class SQLWhereJoin extends SQLWhere {
         }
         return [this.join, ...this.where.getJoins()];
     }
+
+    clone(): this {
+        const c = (new (this.constructor as any)(this.join, this.where.clone())) as this;
+        c.doesRelationAlwaysExist = this.doesRelationAlwaysExist;
+        return c;
+    }
 }
 
 export class SQLWhereAnd extends SQLWhere {
@@ -588,6 +616,11 @@ export class SQLWhereAnd extends SQLWhere {
         // NOT (A AND B) is the same as (NOT A OR NOT B)
         return new SQLWhereOr(this.children.map(c => new SQLWhereNot(c)));
     }
+
+    clone(): this {
+        const c = (new (this.constructor as any)(this.children.map(child => child.clone()))) as this;
+        return c;
+    }
 }
 
 export class SQLWhereOr extends SQLWhere {
@@ -648,6 +681,11 @@ export class SQLWhereOr extends SQLWhere {
         // NOT (A OR B) is the same as (NOT A AND NOT B)
         return new SQLWhereAnd(this.children.map(c => new SQLWhereNot(c)));
     }
+
+    clone(): this {
+        const c = (new (this.constructor as any)(this.children.map(child => child.clone()))) as this;
+        return c;
+    }
 }
 
 export class SQLWhereNot extends SQLWhere {
@@ -659,6 +697,10 @@ export class SQLWhereNot extends SQLWhere {
     }
 
     get isSingle(): boolean {
+        if (this.a instanceof SQLWhereEqual || this.a instanceof SQLWhereAnd || this.a instanceof SQLWhereOr || this.a instanceof SQLWhereNot) {
+            return this.a.inverted().isSingle;
+        }
+
         return this.a.isSingle;
     }
 
@@ -694,4 +736,9 @@ export class SQLWhereNot extends SQLWhere {
     inverted(): SQLWhere {
         return this.a; // NOT NOT A is just A
     }
+
+    clone(): this {
+        const c = (new (this.constructor as any)(this.a.clone())) as this;
+        return c;
+    }
 }