@mikro-orm/knex 6.1.12-dev.0 → 6.1.12-dev.10

package/index.mjs

@@ -102,6 +102,7 @@ export const IntegerType = mod.IntegerType;
 export const IntervalType = mod.IntervalType;
 export const InvalidFieldNameException = mod.InvalidFieldNameException;
 export const IsolationLevel = mod.IsolationLevel;
+export const JSON_KEY_OPERATORS = mod.JSON_KEY_OPERATORS;
 export const JoinType = mod.JoinType;
 export const JsonProperty = mod.JsonProperty;
 export const JsonType = mod.JsonType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.12-dev.0",
+  "version": "6.1.12-dev.10",
   "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": "^6.1.11"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.12-dev.0"
+    "@mikro-orm/core": "6.1.12-dev.10"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -52,6 +52,9 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
                         [core_1.Utils.getPrimaryKeyHash(primaryKeys)]: { [op]: sub.getKnexQuery() },
                     });
                 }
+                if ($and.length === 1) {
+                    return $and[0];
+                }
                 return { $and };
             }
             alias = this.autoJoin(qb, ownerAlias);
@@ -155,15 +158,18 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
         }
     }
     inlineCondition(key, o, value) {
-        if (key in o) {
-            const $and = o.$and ?? [];
-            $and.push({ [key]: o[key] }, { [key]: value });
-            delete o[key];
-            o.$and = $and;
-        }
-        else {
+        if (!(key in o)) {
             o[key] = value;
+            return;
+        }
+        if (key === '$and') {
+            o.$and.push({ [key]: value });
+            return;
         }
+        const $and = o.$and ?? [];
+        $and.push({ [key]: o[key] }, { [key]: value });
+        delete o[key];
+        o.$and = $and;
     }
     shouldAutoJoin(qb, nestedAlias) {
         if (!this.prop || !this.parent) {

package/schema/SchemaHelper.js

@@ -187,8 +187,12 @@ class SchemaHelper {
     mapForeignKeys(fks, tableName, schemaName) {
         return fks.reduce((ret, fk) => {
             if (ret[fk.constraint_name]) {
-                ret[fk.constraint_name].columnNames.push(fk.column_name);
-                ret[fk.constraint_name].referencedColumnNames.push(fk.referenced_column_name);
+                if (!ret[fk.constraint_name].columnNames.includes(fk.column_name)) {
+                    ret[fk.constraint_name].columnNames.push(fk.column_name);
+                }
+                if (!ret[fk.constraint_name].referencedColumnNames.includes(fk.referenced_column_name)) {
+                    ret[fk.constraint_name].referencedColumnNames.push(fk.referenced_column_name);
+                }
             }
             else {
                 ret[fk.constraint_name] = {