@mikro-orm/knex 5.9.5-dev.1 → 5.9.5-dev.3

package/AbstractSqlDriver.js

@@ -81,7 +81,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         if (typeof meta.expression === 'string') {
             return this.wrapVirtualExpressionInSubquery(meta, meta.expression, where, options, type);
         }
-        const em = this.createEntityManager(false);
+        const em = this.createEntityManager();
         em.setTransactionContext(options.ctx);
         const res = meta.expression(em, where, options);
         if (typeof res === 'string') {
@@ -173,19 +173,21 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     relationPojo[prop.name] = root[alias];
                 }
             });
-            meta2.props
-                .filter(prop => this.platform.shouldHaveColumn(prop, p.children || []))
-                .forEach(prop => {
+            const props = meta2.props.filter(prop => this.platform.shouldHaveColumn(prop, p.children || []));
+            for (const prop of props) {
                 if (prop.fieldNames.length > 1) { // composite keys
                     relationPojo[prop.name] = prop.fieldNames.map(name => root[`${relationAlias}__${name}`]);
-                    prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
                 }
                 else {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;
                     relationPojo[prop.name] = root[alias];
-                    delete root[alias];
                 }
-            });
+            }
+            // properties can be mapped to multiple places, e.g. when sharing a column in multiple FKs,
+            // so we need to delete them after everything is mapped from given level
+            for (const prop of props) {
+                prop.fieldNames.map(name => delete root[`${relationAlias}__${name}`]);
+            }
             if ([core_1.ReferenceType.MANY_TO_MANY, core_1.ReferenceType.ONE_TO_MANY].includes(relation.reference)) {
                 result[relation.name] = result[relation.name] || [];
                 result[relation.name].push(relationPojo);
@@ -374,6 +376,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];
         const keys = new Set();
+        const fields = new Set();
         data.forEach(row => Object.keys(row).forEach(k => keys.add(k)));
         const pkCond = core_1.Utils.flatten(meta.primaryKeys.map(pk => meta.properties[pk].fieldNames)).map(pk => `${this.platform.quoteIdentifier(pk)} = ?`).join(' and ');
         const params = [];
@@ -381,6 +384,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         keys.forEach(key => {
             const prop = meta.properties[key];
             prop.fieldNames.forEach((fieldName, fieldNameIdx) => {
+                if (fields.has(fieldName)) {
+                    return;
+                }
+                fields.add(fieldName);
                 sql += `${this.platform.quoteIdentifier(fieldName)} = case`;
                 where.forEach((cond, idx) => {
                     if (key in data[idx]) {

package/AbstractSqlPlatform.d.ts

@@ -14,7 +14,7 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     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): string;
+    getSearchJsonPropertyKey(path: string[], type: string, aliased: boolean, value?: unknown): string;
     isRaw(value: any): boolean;
     supportsSchemas(): boolean;
     /** @inheritDoc */

package/AbstractSqlPlatform.js

@@ -82,7 +82,7 @@ class AbstractSqlPlatform extends core_1.Platform {
     getSearchJsonPropertySQL(path, type, aliased) {
         return this.getSearchJsonPropertyKey(path.split('->'), type, aliased);
     }
-    getSearchJsonPropertyKey(path, type, aliased) {
+    getSearchJsonPropertyKey(path, type, aliased, value) {
         const [a, ...b] = path;
         const quoteKey = (key) => key.match(/^[a-z]\w*$/i) ? key : `"${key}"`;
         if (aliased) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "5.9.5-dev.1",
+  "version": "5.9.5-dev.3",
   "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,9 +66,9 @@
     "@mikro-orm/core": "^5.9.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "5.9.5-dev.1",
-    "@mikro-orm/entity-generator": "5.9.5-dev.1",
-    "@mikro-orm/migrations": "5.9.5-dev.1",
+    "@mikro-orm/core": "5.9.5-dev.3",
+    "@mikro-orm/entity-generator": "5.9.5-dev.3",
+    "@mikro-orm/migrations": "5.9.5-dev.3",
     "better-sqlite3": "*",
     "mssql": "*",
     "mysql": "*",

package/query/ScalarCriteriaNode.js

@@ -20,6 +20,12 @@ class ScalarCriteriaNode extends CriteriaNode_1.CriteriaNode {
                 qb.addSelect(field);
             }
         }
+        if (this.payload && typeof this.payload === 'object') {
+            const keys = Object.keys(this.payload).filter(key => core_1.Utils.isArrayOperator(key) && Array.isArray(this.payload[key]));
+            for (const key of keys) {
+                this.payload[key] = JSON.stringify(this.payload[key]);
+            }
+        }
         return this.payload;
     }
     willAutoJoin(qb, alias) {

package/schema/SchemaComparator.d.ts

@@ -1,3 +1,4 @@
+import { type Dictionary } from '@mikro-orm/core';
 import type { Check, Column, ForeignKey, Index, SchemaDifference, TableDifference } from '../typings';
 import type { DatabaseSchema } from './DatabaseSchema';
 import type { DatabaseTable } from './DatabaseTable';
@@ -51,6 +52,7 @@ export declare class SchemaComparator {
      */
     isIndexFulfilledBy(index1: Index, index2: Index): boolean;
     diffCheck(check1: Check, check2: Check): boolean;
+    parseJsonDefault(defaultValue?: string | null): Dictionary | string | null;
     hasSameDefaultValue(from: Column, to: Column): boolean;
     private mapColumnToProperty;
     private log;

package/schema/SchemaComparator.js

@@ -436,6 +436,15 @@ class SchemaComparator {
         const simplify = (str) => str?.replace(/['"`()]/g, '').toLowerCase();
         return simplify(check1.expression) !== simplify(check2.expression);
     }
+    parseJsonDefault(defaultValue) {
+        if (!defaultValue) {
+            return null;
+        }
+        const val = defaultValue
+            .replace(/^(_\w+\\)?'(.*?)\\?'$/, '$2')
+            .replace(/^\(?'(.*?)'\)?$/, '$1');
+        return (0, core_1.parseJsonSafe)(val);
+    }
     hasSameDefaultValue(from, to) {
         if (from.default == null || from.default.toString().toLowerCase() === 'null' || from.default.toString().startsWith('nextval(')) {
             return to.default == null || to.default.toLowerCase() === 'null';
@@ -446,8 +455,8 @@ class SchemaComparator {
             return defaultValueFrom === defaultValueTo;
         }
         if (to.mappedType instanceof core_1.JsonType) {
-            const defaultValueFrom = (0, core_1.parseJsonSafe)(from.default.replace(/^(_\w+\\)?'(.*?)\\?'$/, '$2'));
-            const defaultValueTo = (0, core_1.parseJsonSafe)(to.default?.replace(/^\(?'(.*?)'\)?$/, '$1'));
+            const defaultValueFrom = this.parseJsonDefault(from.default);
+            const defaultValueTo = this.parseJsonDefault(to.default);
             return core_1.Utils.equals(defaultValueFrom, defaultValueTo);
         }
         if (to.mappedType instanceof core_1.DateTimeType && from.default && to.default) {