@stamhoofd/sql 2.83.5 → 2.84.0

package/dist/tests/utils/index.js

@@ -0,0 +1,206 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testError = testError;
+exports.test = test;
+exports.testSelect = testSelect;
+exports.testMultiple = testMultiple;
+exports.testMultipleErrors = testMultipleErrors;
+exports.doesQueryMatch = doesQueryMatch;
+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 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);
+}
+/**
+ * Only compares the WHERE clause of the query.
+ */
+async function test({ filter, filters, query }) {
+    const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+    if (where.isAlways === false) {
+        doesQueryMatch('', query);
+        return;
+    }
+    if (where.isAlways === true) {
+        doesQueryMatch('true', query);
+        return;
+    }
+    const sql = where.getSQL({
+        defaultNamespace: 'default',
+        parentNamespace: 'parent',
+    });
+    doesQueryMatch(sql, 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);
+    if (where.isAlways === false) {
+        doesQueryMatch('', query);
+        return;
+    }
+    const select = SQL_1.SQL.select().from('test_table').where(where);
+    let sql;
+    try {
+        sql = select.getSQL();
+    }
+    catch (e) {
+        console.error('Error in testSelect:', e);
+        console.error('testSelect', select, where, (where instanceof SQLWhere_1.SQLWhereAnd ? where.children : where));
+        throw e;
+    }
+    doesQueryMatch(sql, query);
+}
+async function testMultiple({ testFilters, filters, query }) {
+    for (const filter of testFilters) {
+        await test({
+            filter,
+            filters,
+            query,
+        });
+    }
+}
+async function testMultipleErrors({ testFilters, filters, error }) {
+    for (const filter of testFilters) {
+        await testError({
+            filter,
+            filters,
+            error,
+        });
+    }
+}
+function doesQueryMatch(query, withQuery) {
+    const str1 = typeof query === 'string' ? query : query.query;
+    const str2 = typeof withQuery === 'string' ? withQuery : withQuery.query;
+    const params1 = typeof query === 'string' ? [] : query.params;
+    const params2 = typeof withQuery === 'string' ? [] : withQuery.params;
+    expect(str1).toBe(str2);
+    expect(params1).toEqual(params2);
+}
+function createTableDefinition(tableName, definition) {
+    const columns = Object.entries(definition).map(([name, { type, nullable }]) => {
+        const stringType = type === 'varchar' ? 'VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci' : type;
+        return `\`${name}\` ${stringType}${nullable ? '' : ' NOT NULL'}`;
+    }).join(',\n');
+    return `CREATE TABLE \`${tableName}\` (\n${columns}\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;`;
+}
+let didAdd = false;
+function closeDatabaseAfterTests() {
+    if (didAdd) {
+        return;
+    }
+    didAdd = true;
+    test_utils_1.TestUtils.addAfterAll(async () => {
+        try {
+            await simple_database_1.Database.end();
+        }
+        catch (error) {
+            console.error('Failed to close database connection after tests:', error);
+        }
+    });
+}
+/**
+ * Tests actual MySQL behaviour, for complex queries that depend on MySQL behaviour.
+ *
+ * Creates a table, inserts a row with provided data. Then runs a query with the provided filter and checks if the row matches the expected query.
+ *
+ * Snapshots the query.
+ */
+async function testMatch({ tableDefinition, rows, doMatch, doNotMatch, filters }) {
+    const tableName = 'test_table_' + Math.random().toString(36).substring(2, 15);
+    const createTableSQL = createTableDefinition(tableName, tableDefinition);
+    closeDatabaseAfterTests();
+    try {
+        await simple_database_1.Database.statement(createTableSQL);
+    }
+    catch (error) {
+        console.error('Failed to create test table:', error);
+        throw error;
+    }
+    // Insert test rows
+    for (const row of rows) {
+        const mappedValues = {};
+        for (const [key, value] of Object.entries(row)) {
+            if (value === null) {
+                mappedValues[key] = null;
+            }
+            else if (typeof value === 'object' && !(value instanceof Date)) {
+                mappedValues[key] = JSON.stringify(value);
+            }
+            else {
+                mappedValues[key] = value;
+            }
+        }
+        try {
+            await simple_database_1.Database.insert('INSERT INTO `' + tableName + '` SET ?', [mappedValues]);
+        }
+        catch (insertError) {
+            console.error('Failed to insert row:', insertError, row);
+            throw insertError;
+        }
+    }
+    // Run queries
+    try {
+        for (const filter of doMatch ?? []) {
+            const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+            const select = SQL_1.SQL.select().from(tableName).where(where);
+            let results;
+            try {
+                results = await select.fetch();
+            }
+            catch (e) {
+                console.error('SQL error for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), e);
+                throw e;
+            }
+            if (results.length !== rows.length) {
+                console.error('Unexpected results for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), results);
+            }
+            expect(results).toHaveLength(rows.length);
+            const query = select.getSQL();
+            expect({
+                query: query.query.replaceAll('`' + tableName + '`', '`test_table`'),
+                params: query.params,
+            }).toMatchSnapshot('SQL Query for filter: ' + JSON.stringify(filter));
+        }
+        for (const filter of doNotMatch ?? []) {
+            const where = await (0, SQLModernFilter_1.compileToModernSQLFilter)(filter, filters);
+            const select = SQL_1.SQL.select().from(tableName).where(where);
+            let results;
+            try {
+                results = await select.fetch();
+            }
+            catch (e) {
+                console.error('SQL error for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), e);
+                throw e;
+            }
+            if (results.length > 0) {
+                console.error('Unexpected results for filter:', filter, 'on table:', tableName, 'with where:', select.getSQL(), results);
+            }
+            expect(results).toHaveLength(0);
+            if (!select._where || !select._where.isAlwaysFalse) {
+                const query = select.getSQL();
+                expect({
+                    query: query.query.replaceAll('`' + tableName + '`', '`test_table`'),
+                    params: query.params,
+                }).toMatchSnapshot('SQL Query for not match filter: ' + JSON.stringify(filter));
+            }
+            else {
+                expect('always false').toMatchSnapshot('SQL Query for not match filter: ' + JSON.stringify(filter));
+            }
+        }
+    }
+    finally {
+        try {
+            await simple_database_1.Database.statement(`DROP TABLE IF EXISTS \`${tableName}\``);
+        }
+        catch (dropError) {
+            console.error('Failed to drop table after error:', dropError);
+        }
+    }
+}
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"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","../index.ts","../../../../environment.d.ts","../../../../jest-extended.d.ts","../../../stamhoofd.d.ts"],"version":"5.6.2"}
+{"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.6.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/sql",
-    "version": "2.83.5",
+    "version": "2.84.0",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "license": "UNLICENCED",
@@ -10,10 +10,11 @@
         "dist"
     ],
     "scripts": {
-        "build": "tsc -b"
+        "build": "tsc -b",
+        "test": "jest"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "6ba039bba88e801583188774a254c61e5ab28922"
+    "gitHead": "99cf8650892792358d7516bb83458642d886dee7"
 }

package/src/QueryableModel.ts

@@ -41,9 +41,29 @@ export class QueryableModel extends Model {
         }
 
         const me = await (this.static as typeof QueryableModel).select().where(this.static.primary.name, this.getPrimaryKey()).first(true);
+        this.copyFrom(me);
+    }
+
+    static async refreshAll<T extends typeof QueryableModel>(this: T, list: InstanceType<T>[]) {
+        // Cut up in batches of max 100
+        const batchSize = 100;
+        for (let i = 0; i < list.length; i += batchSize) {
+            const batch = list.slice(i, i + batchSize);
+            const ids = list.map(item => item.getPrimaryKey()).filter(id => id !== null);
+            if (ids.length === 0) {
+                continue;
+            }
 
-        for (const column of this.static.columns.values()) {
-            this[column.name] = me[column.name];
+            const refreshed = await this.getByIDs(...ids);
+
+            for (const item of batch) {
+                const refreshedItem = refreshed.find(r => r.getPrimaryKey() === item.getPrimaryKey());
+                if (refreshedItem) {
+                    for (const column of this.columns.values()) {
+                        item[column.name] = refreshedItem[column.name];
+                    }
+                }
+            }
         }
     }
 }

package/src/SQL.ts

@@ -1,10 +1,10 @@
 import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { SQLDelete } from './SQLDelete';
-import { isSQLExpression, SQLExpression } from './SQLExpression';
-import { SQLAssignment, SQLColumnExpression, SQLColumnExpressionParams, SQLIf, SQLSafeValue, SQLScalar, SQLScalarValue, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions';
+import { isSQLExpression, SQLExpression, SQLNamedExpression } from './SQLExpression';
+import { SQLAssignment, SQLColumnExpression, SQLColumnExpressionParams, SQLIf, SQLParentNamespace, SQLSafeValue, SQLScalar, SQLScalarValue, SQLTableExpression, SQLWildcardSelectExpression } from './SQLExpressions';
 import { SQLInsert } from './SQLInsert';
 import { SQLJoin, SQLJoinType } from './SQLJoin';
-import { SQLJsonExtract, SQLJsonLength, SQLJsonUnquote, SQLLpad } from './SQLJsonExpressions';
+import { SQLJsonExtract, SQLJsonKeys, SQLJsonLength, SQLJsonUnquote, SQLLpad } from './SQLJsonExpressions';
 import { parseTable, SQLSelect } from './SQLSelect';
 import { SQLUpdate } from './SQLUpdate';
 import { ParseWhereArguments, SQLEmptyWhere, SQLWhere } from './SQLWhere';
@@ -18,10 +18,18 @@ class StaticSQL {
         return new SQLColumnExpression(...args);
     }
 
+    parentColumn(column: string): SQLColumnExpression {
+        return new SQLColumnExpression(SQLParentNamespace, column);
+    }
+
     jsonValue(column: SQLExpression, path: string, asScalar = false): SQLJsonExtract {
         return new SQLJsonExtract(column, asScalar ? new SQLScalar(path) : new SQLSafeValue(path));
     }
 
+    jsonKeys(column: SQLExpression): SQLJsonKeys {
+        return new SQLJsonKeys(column);
+    }
+
     lpad(column: SQLExpression, length: number, value: string): SQLLpad {
         return new SQLLpad(column, new SQLSafeValue(length), new SQLSafeValue(value));
     }
@@ -34,13 +42,8 @@ class StaticSQL {
         return new SQLJsonLength(column, path ? new SQLSafeValue(path) : undefined);
     }
 
-    table(namespace: string, table: string): SQLTableExpression;
-    table(table: string): SQLTableExpression;
-    table(namespaceOrTable: string, table?: string): SQLTableExpression {
-        if (table === undefined) {
-            return new SQLTableExpression(namespaceOrTable);
-        }
-        return new SQLTableExpression(namespaceOrTable, table);
+    table(table: string, asNamespace?: string): SQLTableExpression {
+        return new SQLTableExpression(table, asNamespace);
     }
 
     select(...columns: (SQLExpression | string)[]): InstanceType<typeof SQLSelect<SQLResultNamespacedRow>> {
@@ -74,32 +77,20 @@ class StaticSQL {
         return new SQLDelete();
     }
 
-    leftJoin(namespace: string, table: string): SQLJoin;
-    leftJoin(table: string): SQLJoin;
-    leftJoin(expression: SQLExpression): SQLJoin;
-    leftJoin(tableOrExpressiongOrNamespace: SQLExpression | string, table?: string): SQLJoin {
-        return new SQLJoin(SQLJoinType.Left, parseTable(tableOrExpressiongOrNamespace, table));
+    leftJoin(...args: Parameters<typeof parseTable>): SQLJoin {
+        return new SQLJoin(SQLJoinType.Left, parseTable(...args));
     }
 
-    rightJoin(namespace: string, table: string): SQLJoin;
-    rightJoin(table: string): SQLJoin;
-    rightJoin(expression: SQLExpression): SQLJoin;
-    rightJoin(tableOrExpressiongOrNamespace: SQLExpression | string, table?: string): SQLJoin {
-        return new SQLJoin(SQLJoinType.Right, parseTable(tableOrExpressiongOrNamespace, table));
+    rightJoin(...args: Parameters<typeof parseTable>): SQLJoin {
+        return new SQLJoin(SQLJoinType.Right, parseTable(...args));
     }
 
-    innerJoin(namespace: string, table: string): SQLJoin;
-    innerJoin(table: string): SQLJoin;
-    innerJoin(expression: SQLExpression): SQLJoin;
-    innerJoin(tableOrExpressiongOrNamespace: SQLExpression | string, table?: string): SQLJoin {
-        return new SQLJoin(SQLJoinType.Inner, parseTable(tableOrExpressiongOrNamespace, table));
+    innerJoin(...args: Parameters<typeof parseTable>): SQLJoin {
+        return new SQLJoin(SQLJoinType.Inner, parseTable(...args));
     }
 
-    join(namespace: string, table: string): SQLJoin;
-    join(table: string): SQLJoin;
-    join(expression: SQLExpression): SQLJoin;
-    join(tableOrExpressiongOrNamespace: SQLExpression | string, table?: string): SQLJoin {
-        return new SQLJoin(SQLJoinType.Inner, parseTable(tableOrExpressiongOrNamespace, table));
+    join(...args: Parameters<typeof parseTable>): SQLJoin {
+        return new SQLJoin(SQLJoinType.Inner, parseTable(...args));
     }
 
     if(...args: ConstructorParameters<typeof SQLIf>): SQLIf {

package/src/SQLDelete.ts

@@ -1,7 +1,7 @@
-import { Database } from "@simonbackx/simple-database";
-import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery, normalizeSQLQuery } from "./SQLExpression";
+import { Database } from '@simonbackx/simple-database';
+import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery, normalizeSQLQuery } from './SQLExpression';
 import { SQLJoin } from './SQLJoin';
-import { SQLWhere, Whereable } from "./SQLWhere";
+import { SQLWhere, Whereable } from './SQLWhere';
 
 class EmptyClass {}
 export class SQLDelete extends Whereable(EmptyClass) implements SQLExpression {
@@ -9,7 +9,7 @@ export class SQLDelete extends Whereable(EmptyClass) implements SQLExpression {
     _joins: (InstanceType<typeof SQLJoin>)[] = [];
 
     clone(): this {
-        const c = new SQLDelete()
+        const c = new SQLDelete();
         Object.assign(c, this);
         return c as any;
     }
@@ -26,37 +26,48 @@ export class SQLDelete extends Whereable(EmptyClass) implements SQLExpression {
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         const query: SQLQuery[] = [
-            'DELETE'
-        ]
+            'DELETE',
+        ];
 
-        options = options ?? {}
+        options = options ?? {};
         options.defaultNamespace = (this._from as any).namespace ?? (this._from as any).table ?? undefined;
 
         query.push(
-            'FROM' 
-        )
+            'FROM',
+        );
 
         query.push(this._from.getSQL(options));
 
-        query.push(...this._joins.map(j => j.getSQL(options)))
+        query.push(...this._joins.map(j => j.getSQL(options)));
 
+        // Where
         if (this._where) {
-            query.push('WHERE')
-            query.push(this._where.getSQL(options))
+            const always = this._where.isAlways;
+            if (always === false) {
+                throw new Error('Cannot use SQLDelete with a where that is not always true');
+            }
+            else if (always === null) {
+                query.push('WHERE');
+                query.push(this._where.getSQL(options));
+            }
         }
 
         return joinSQLQuery(query, ' ');
     }
 
-    async delete(): Promise<{affectedRows: number}> {
-        const {query, params} = normalizeSQLQuery(this.getSQL())
+    async delete(): Promise<{ affectedRows: number }> {
+        if (this._where && this._where.isAlways === false) {
+            return { affectedRows: 0 };
+        }
+
+        const { query, params } = normalizeSQLQuery(this.getSQL());
 
         console.log(query, params);
         const [rows] = await Database.delete(query, params);
         return rows;
     }
 
-    async then(onFulfilled: (value: {affectedRows: number}) => any, onRejected: (reason: any) => any): Promise<any> {
+    async then(onFulfilled: (value: { affectedRows: number }) => any, onRejected: (reason: any) => any): Promise<any> {
         return this.delete().then(onFulfilled, onRejected);
     }
 }

package/src/SQLExpression.ts

@@ -25,6 +25,10 @@ export interface SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery;
 }
 
+export interface SQLNamedExpression extends SQLExpression {
+    getName(): string;
+}
+
 export function isSQLExpression(obj: unknown): obj is SQLExpression {
     return typeof obj === 'object' && obj !== null && !!(obj as any).getSQL && typeof (obj as any).getSQL === 'function';
 }

package/src/SQLExpressions.ts

@@ -1,5 +1,5 @@
 import { Database } from '@simonbackx/simple-database';
-import { joinSQLQuery, SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression';
+import { joinSQLQuery, SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery } from './SQLExpression';
 import { ParseWhereArguments, SQLEmptyWhere } from './SQLWhere';
 
 export type SQLScalarValue = string | number | boolean | Date;
@@ -269,7 +269,7 @@ export class SQLCast implements SQLExpression {
     }
 }
 
-export class SQLJSONValue implements SQLExpression {
+class SQLCastedJson implements SQLExpression {
     value: null | true | false;
 
     constructor(value: null | true | false) {
@@ -280,6 +280,9 @@ export class SQLJSONValue implements SQLExpression {
         return "CAST('" + JSON.stringify(this.value) + "' AS JSON)";
     }
 }
+export const SQLJSONNull = new SQLCastedJson(null);
+export const SQLJSONTrue = new SQLCastedJson(true);
+export const SQLJSONFalse = new SQLCastedJson(false);
 
 export class SQLNull implements SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
@@ -418,26 +421,32 @@ export class SQLColumnExpression implements SQLExpression {
     }
 }
 
-export class SQLTableExpression implements SQLExpression {
-    namespace?: string;
+export class SQLTableExpression implements SQLNamedExpression {
+    /**
+     * By default the table name will be used as the namespace by MySQL.
+     */
+    asNamespace?: string;
+
+    /**
+     * For now this is just a string, but thearetically it could be a subquery.
+     * We don't support that yet, as those queries are not optimized for performance.
+     */
     table: string;
 
-    constructor(namespace: string, table: string);
-    constructor(table: string);
-    constructor(namespaceOrTable: string, table?: string) {
-        if (table === undefined) {
-            this.table = namespaceOrTable;
-            return;
-        }
-        this.namespace = namespaceOrTable;
+    constructor(table: string, asNamespace?: string) {
+        this.asNamespace = asNamespace;
         this.table = table;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
-        if (!this.namespace) {
+        if (!this.asNamespace) {
             return Database.escapeId(this.table);
         }
-        return Database.escapeId(this.table) + ' ' + Database.escapeId(this.namespace);
+        return Database.escapeId(this.table) + ' ' + Database.escapeId(this.asNamespace);
+    }
+
+    getName(): string {
+        return this.asNamespace ?? this.table;
     }
 }
 

package/src/SQLJoin.ts

@@ -1,4 +1,4 @@
-import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression';
+import { SQLExpression, SQLExpressionOptions, SQLNamedExpression, SQLQuery, joinSQLQuery } from './SQLExpression';
 import { Whereable } from './SQLWhere';
 
 export enum SQLJoinType {
@@ -11,9 +11,9 @@ export enum SQLJoinType {
 class EmptyClass {}
 export class SQLJoin extends Whereable(EmptyClass) implements SQLExpression {
     type = SQLJoinType.Left;
-    table: SQLExpression;
+    table: SQLNamedExpression;
 
-    constructor(type: SQLJoinType, table: SQLExpression) {
+    constructor(type: SQLJoinType, table: SQLNamedExpression) {
         super();
         this.type = type;
         this.table = table;
@@ -33,7 +33,11 @@ export class SQLJoin extends Whereable(EmptyClass) implements SQLExpression {
             this.getJoinPrefix(),
             this.table?.getSQL(options),
             this._where ? 'ON' : undefined,
-            this._where?.getSQL(options),
+            this._where?.getSQL({
+                ...options,
+                parentNamespace: options?.defaultNamespace,
+                defaultNamespace: this.table.getName(),
+            }),
         ], ' ');
     }
 }

package/src/SQLJsonExpressions.ts

@@ -1,18 +1,18 @@
 import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression';
-import { SQLJSONValue, SQLSafeValue, SQLScalar, SQLScalarValue } from './SQLExpressions';
+import { SQLJSONFalse, SQLJSONNull, SQLJSONTrue, SQLSafeValue, SQLScalar, SQLScalarValue } from './SQLExpressions';
 import { SQLWhere } from './SQLWhere';
 
 export function scalarToSQLJSONExpression(s: SQLScalarValue | null): SQLExpression {
     if (s === null) {
-        return new SQLJSONValue(null);
+        return SQLJSONNull;
     }
 
     if (s === true) {
-        return new SQLJSONValue(true);
+        return SQLJSONTrue;
     }
 
     if (s === false) {
-        return new SQLJSONValue(false);
+        return SQLJSONFalse;
     }
 
     return new SQLScalar(s);
@@ -34,6 +34,39 @@ export class SQLJsonUnquote implements SQLExpression {
     }
 }
 
+export type SQLJsonValueType = 'FLOAT' | 'DOUBLE' | 'DECIMAL' | 'SIGNED' | 'UNSIGNED' | 'DATE' | 'TIME' | 'DATETIME' | 'YEAR' | 'CHAR' | 'JSON';
+
+export class SQLJsonValue implements SQLExpression {
+    target: SQLExpression;
+    path: SQLExpression;
+    type?: SQLJsonValueType;
+
+    constructor(target: SQLExpression, type?: SQLJsonValueType, path?: SQLExpression) {
+        this.target = target;
+        this.type = type;
+
+        if (!path && target instanceof SQLJsonExtract) {
+            // If the target is a SQLJsonExtract, we can use its path directly
+            this.target = target.target;
+            this.path = target.path;
+            return;
+        }
+
+        this.path = path ?? new SQLSafeValue('$');
+    }
+
+    getSQL(options?: SQLExpressionOptions): SQLQuery {
+        return joinSQLQuery([
+            'JSON_VALUE(',
+            this.target.getSQL(options),
+            ',',
+            this.path.getSQL(options),
+            (this.type ? ' RETURNING ' + this.type + (this.type === 'CHAR' ? ' CHARACTER SET utf8mb4' : '') : ''),
+            ' ERROR ON ERROR)',
+        ]);
+    }
+}
+
 /**
  * Same as target->path, JSON_EXTRACT(target, path)
  */
@@ -55,6 +88,34 @@ export class SQLJsonExtract implements SQLExpression {
             ')',
         ]);
     }
+
+    /**
+     * NOTE: this has to be combined with asScalar = true! Never let user input in a query without passing it as a parameter.
+     *
+     * E.g. SQL.jsonValue(SQL.column('settings'), `$.value.prices[*].bundleDiscounts.${SQLJsonExtract.escapePathComponent(key)}`, true) (note that last true!)
+     */
+    static escapePathComponent(str: string) {
+        return '"' + str.replace(/(["\\])/g, '\\$1') + '"';
+    }
+}
+
+/**
+ * Same as target->path, JSON_EXTRACT(target, path)
+ */
+export class SQLJsonKeys implements SQLExpression {
+    target: SQLExpression;
+
+    constructor(target: SQLExpression) {
+        this.target = target;
+    }
+
+    getSQL(options?: SQLExpressionOptions): SQLQuery {
+        return joinSQLQuery([
+            'JSON_KEYS(',
+            this.target.getSQL(options),
+            ')',
+        ]);
+    }
 }
 
 export class SQLJsonLength implements SQLExpression {