@mikro-orm/knex 6.4.1-dev.1 → 6.4.1-dev.11

package/PivotCollectionPersister.d.ts

@@ -10,7 +10,7 @@ export declare class PivotCollectionPersister<Entity extends object> {
     private readonly deletes;
     private readonly batchSize;
     private order;
-    constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction, schema?: string | undefined);
+    constructor(meta: EntityMetadata<Entity>, driver: AbstractSqlDriver, ctx?: Transaction | undefined, schema?: string | undefined);
     enqueueUpdate(prop: EntityProperty<Entity>, insertDiff: Primary<Entity>[][], deleteDiff: Primary<Entity>[][] | boolean, pks: Primary<Entity>[]): void;
     private enqueueInsert;
     private enqueueDelete;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.4.1-dev.1",
+  "version": "6.4.1-dev.11",
   "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,7 +66,7 @@
     "@mikro-orm/core": "^6.4.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.1-dev.1",
+    "@mikro-orm/core": "6.4.1-dev.11",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/query/CriteriaNodeFactory.js

@@ -49,6 +49,9 @@ class CriteriaNodeFactory {
     static createObjectItemNode(metadata, entityName, node, payload, key, meta) {
         const prop = meta?.properties[key];
         const childEntity = prop && prop.kind !== core_1.ReferenceKind.SCALAR ? prop.type : entityName;
+        if (prop?.customType instanceof core_1.JsonType) {
+            return this.createScalarNode(metadata, childEntity, payload[key], node, key);
+        }
         if (prop?.kind !== core_1.ReferenceKind.EMBEDDED) {
             return this.createNode(metadata, childEntity, payload[key], node, key);
         }

package/query/QueryBuilder.js

@@ -529,7 +529,7 @@ class QueryBuilder {
         core_1.Utils.runIfNotEmpty(() => qb.offset(this._offset), this._offset);
         core_1.Utils.runIfNotEmpty(() => this._comments.forEach(comment => qb.comment(comment)), this._comments);
         core_1.Utils.runIfNotEmpty(() => this._hintComments.forEach(comment => qb.hintComment(comment)), this._hintComments);
-        core_1.Utils.runIfNotEmpty(() => this.helper.appendOnConflictClause(type, this._onConflict, qb), this._onConflict);
+        core_1.Utils.runIfNotEmpty(() => this.helper.appendOnConflictClause(enums_1.QueryType.UPSERT, this._onConflict, qb), this._onConflict);
         if (this.type === enums_1.QueryType.TRUNCATE && this.platform.usesCascadeStatement()) {
             return this._query.qb = this.knex.raw(qb.toSQL().toNative().sql + ' cascade');
         }
@@ -768,6 +768,7 @@ class QueryBuilder {
             case enums_1.QueryType.INSERT:
             case enums_1.QueryType.UPDATE:
             case enums_1.QueryType.DELETE:
+            case enums_1.QueryType.UPSERT:
             case enums_1.QueryType.TRUNCATE:
                 return this.execute('run').then(onfulfilled, onrejected);
             case enums_1.QueryType.COUNT:

package/query/QueryBuilderHelper.js

@@ -93,7 +93,7 @@ class QueryBuilderHelper {
             }
             return this.knex.raw(`${value}${as}`);
         }
-        if (prop?.hasConvertToJSValueSQL) {
+        if (prop?.hasConvertToJSValueSQL && type !== enums_1.QueryType.UPSERT) {
             let valueSQL;
             if (prop.fieldNames.length > 1 && fkIdx !== -1) {
                 const fk = prop.targetMeta.getPrimaryProps()[fkIdx];
@@ -736,7 +736,7 @@ class QueryBuilderHelper {
         const meta = this.metadata.get(this.entityName);
         const tableName = this.driver.getTableName(meta, { schema }, false);
         for (const key of Object.keys(cond)) {
-            const mapped = this.mapper(key, enums_1.QueryType.INSERT);
+            const mapped = this.mapper(key, enums_1.QueryType.UPSERT);
             core_1.Utils.renameKey(cond, key, tableName + '.' + mapped);
         }
         return cond;

package/query/enums.d.ts

@@ -4,7 +4,8 @@ export declare enum QueryType {
     COUNT = "COUNT",
     INSERT = "INSERT",
     UPDATE = "UPDATE",
-    DELETE = "DELETE"
+    DELETE = "DELETE",
+    UPSERT = "UPSERT"
 }
 export declare enum JoinType {
     leftJoin = "left join",

package/query/enums.js

@@ -9,6 +9,7 @@ var QueryType;
     QueryType["INSERT"] = "INSERT";
     QueryType["UPDATE"] = "UPDATE";
     QueryType["DELETE"] = "DELETE";
+    QueryType["UPSERT"] = "UPSERT";
 })(QueryType || (exports.QueryType = QueryType = {}));
 var JoinType;
 (function (JoinType) {