@mikro-orm/knex 6.0.0-dev.293 → 6.0.0-dev.294

package/AbstractSqlPlatform.d.ts

@@ -11,7 +11,6 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     lookupExtensions(orm: MikroORM): void;
     getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SqlSchemaGenerator;
     quoteValue(value: any): string;
-    formatQuery(sql: string, params: readonly any[]): string;
     getSearchJsonPropertySQL(path: string, type: string, aliased: boolean): string;
     getSearchJsonPropertyKey(path: string[], type: string, aliased: boolean, value?: unknown): string;
     getJsonIndexDefinition(index: IndexDef): string[];

package/AbstractSqlPlatform.js

@@ -41,45 +41,6 @@ class AbstractSqlPlatform extends core_1.Platform {
         // @ts-ignore
         return (0, sqlstring_1.escape)(value, true, this.timezone);
     }
-    formatQuery(sql, params) {
-        if (params.length === 0) {
-            return sql;
-        }
-        // fast string replace without regexps
-        let j = 0;
-        let pos = 0;
-        let ret = '';
-        if (sql[0] === '?') {
-            if (sql[1] === '?') {
-                ret += this.quoteIdentifier(params[j++]);
-                pos = 2;
-            }
-            else {
-                ret += this.quoteValue(params[j++]);
-                pos = 1;
-            }
-        }
-        while (pos < sql.length) {
-            const idx = sql.indexOf('?', pos + 1);
-            if (idx === -1) {
-                ret += sql.substring(pos, sql.length);
-                break;
-            }
-            if (sql.substring(idx - 1, idx + 1) === '\\?') {
-                ret += sql.substring(pos, idx - 1) + '?';
-                pos = idx + 1;
-            }
-            else if (sql.substring(idx, idx + 2) === '??') {
-                ret += sql.substring(pos, idx) + this.quoteIdentifier(params[j++]);
-                pos = idx + 2;
-            }
-            else {
-                ret += sql.substring(pos, idx) + this.quoteValue(params[j++]);
-                pos = idx + 1;
-            }
-        }
-        return ret;
-    }
     getSearchJsonPropertySQL(path, type, aliased) {
         return this.getSearchJsonPropertyKey(path.split('->'), type, aliased);
     }

package/index.mjs

@@ -194,6 +194,7 @@ export const compareArrays = mod.compareArrays;
 export const compareBooleans = mod.compareBooleans;
 export const compareBuffers = mod.compareBuffers;
 export const compareObjects = mod.compareObjects;
+export const createSqlFunction = mod.createSqlFunction;
 export const defineConfig = mod.defineConfig;
 export const equals = mod.equals;
 export const getOnConflictFields = mod.getOnConflictFields;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.293",
+  "version": "6.0.0-dev.294",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -66,6 +66,6 @@
     "@mikro-orm/core": "^5.0.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.293"
+    "@mikro-orm/core": "6.0.0-dev.294"
   }
 }

package/query/QueryBuilderHelper.js

@@ -202,11 +202,11 @@ class QueryBuilderHelper {
                 const alias = join.inverseAlias ?? join.alias;
                 join.cond[`${alias}.${typeProperty}`] = join.prop.targetMeta.discriminatorValue;
             }
-            Object.keys(join.cond).forEach(key => {
-                const needsPrefix = key.includes('.') || core_1.Utils.isOperator(key) || core_1.RawQueryFragment.isKnownFragment(key);
-                const newKey = needsPrefix ? key : `${join.alias}.${key}`;
-                conditions.push(this.processJoinClause(newKey, join.cond[key], params));
-            });
+            for (const key of Object.keys(join.cond)) {
+                const hasPrefix = key.includes('.') || core_1.Utils.isOperator(key) || core_1.RawQueryFragment.isKnownFragment(key);
+                const newKey = hasPrefix ? key : `${join.alias}.${key}`;
+                conditions.push(this.processJoinClause(newKey, join.cond[key], join.alias, params));
+            }
             let sql = method + ' ';
             if (join.subquery) {
                 sql += `(${join.subquery})`;
@@ -221,10 +221,10 @@ class QueryBuilderHelper {
             return qb.joinRaw(sql, params);
         });
     }
-    processJoinClause(key, value, params, operator = '$eq') {
+    processJoinClause(key, value, alias, params, operator = '$eq') {
         if (core_1.Utils.isGroupOperator(key) && Array.isArray(value)) {
             const parts = value.map(sub => {
-                return this.wrapQueryGroup(Object.keys(sub).map(k => this.processJoinClause(k, sub[k], params)));
+                return this.wrapQueryGroup(Object.keys(sub).map(k => this.processJoinClause(k, sub[k], alias, params)));
             });
             return this.wrapQueryGroup(parts, key);
         }
@@ -236,11 +236,11 @@ class QueryBuilderHelper {
             value = this.platform.getRegExpValue(value);
         }
         if (core_1.Utils.isOperator(key, false) && core_1.Utils.isPlainObject(value)) {
-            const parts = Object.keys(value).map(k => this.processJoinClause(k, value[k], params, key));
+            const parts = Object.keys(value).map(k => this.processJoinClause(k, value[k], alias, params, key));
             return key === '$not' ? `not ${this.wrapQueryGroup(parts)}` : this.wrapQueryGroup(parts);
         }
         if (core_1.Utils.isPlainObject(value) && Object.keys(value).every(k => core_1.Utils.isOperator(k, false))) {
-            const parts = Object.keys(value).map(op => this.processJoinClause(key, value[op], params, op));
+            const parts = Object.keys(value).map(op => this.processJoinClause(key, value[op], alias, params, op));
             return this.wrapQueryGroup(parts);
         }
         operator = operator === '$not' ? '$eq' : operator;
@@ -267,7 +267,7 @@ class QueryBuilderHelper {
         }
         const rawField = core_1.RawQueryFragment.getKnownFragment(key);
         if (rawField) {
-            let sql = rawField.sql;
+            let sql = rawField.sql.replaceAll(core_1.ALIAS_REPLACEMENT, alias);
             params.push(...rawField.params);
             params.push(...core_1.Utils.asArray(value));
             if (core_1.Utils.asArray(value).length > 0) {

package/schema/SchemaHelper.js

@@ -201,6 +201,10 @@ class SchemaHelper {
         if (defaultValue == null) {
             return defaultValue;
         }
+        const raw = core_1.RawQueryFragment.getKnownFragment(defaultValue);
+        if (raw) {
+            return this.platform.formatQuery(raw.sql, raw.params);
+        }
         const genericValue = defaultValue.replace(/\(\d+\)/, '(?)').toLowerCase();
         const norm = defaultValues[genericValue];
         if (!norm) {