@mikro-orm/knex 6.0.0-dev.85 → 6.0.0-dev.87

package/AbstractSqlConnection.js

@@ -123,7 +123,7 @@ class AbstractSqlConnection extends core_1.Connection {
         });
     }
     getKnexOptions(type) {
-        const config = core_1.Utils.merge({
+        const config = core_1.Utils.mergeConfig({
             client: type,
             connection: this.getConnectionOptions(),
             pool: this.config.get('pool'),
@@ -185,5 +185,5 @@ class AbstractSqlConnection extends core_1.Connection {
         };
     }
 }
-AbstractSqlConnection.__patched = false;
 exports.AbstractSqlConnection = AbstractSqlConnection;
+AbstractSqlConnection.__patched = false;

package/AbstractSqlDriver.js

@@ -91,7 +91,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const em = this.createEntityManager(false);
         em.setTransactionContext(options.ctx);
         const res = meta.expression(em, where, options);
-        if (res instanceof (query_1.QueryBuilder)) {
+        if (res instanceof query_1.QueryBuilder) {
             return this.wrapVirtualExpressionInSubquery(meta, res.getFormattedQuery(), where, options);
         }
         /* istanbul ignore next */
@@ -109,7 +109,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const em = this.createEntityManager(false);
         em.setTransactionContext(options.ctx);
         const res = meta.expression(em, where, options);
-        if (res instanceof (query_1.QueryBuilder)) {
+        if (res instanceof query_1.QueryBuilder) {
             return this.wrapVirtualExpressionInSubquery(meta, res.getFormattedQuery(), where, options, query_1.QueryType.COUNT);
         }
         /* istanbul ignore next */
@@ -357,7 +357,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 qb.insert(data)
                     .onConflict(uniqueFields.map(p => meta?.properties[p]?.fieldNames[0] ?? p))
                     .merge(core_1.Utils.keys(data).filter(f => !uniqueFields.includes(f)))
-                    .returning(meta?.comparableProps.filter(p => !p.lazy && !(p.name in data)).map(p => p.name) ?? '*');
+                    .returning(meta?.comparableProps.filter(p => !p.lazy && !p.embeddable && !(p.name in data)).map(p => p.name) ?? '*');
             }
             else {
                 qb.update(data).where(where);
@@ -379,7 +379,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             qb.insert(data)
                 .onConflict(uniqueFields.map(p => meta.properties[p]?.fieldNames[0] ?? p))
                 .merge(Object.keys(data[0]).filter(f => !uniqueFields.includes(f)))
-                .returning(meta.comparableProps.filter(p => !p.lazy && !(p.name in data[0])).map(p => p.name) ?? '*');
+                .returning(meta.comparableProps.filter(p => !p.lazy && !p.embeddable && !(p.name in data[0])).map(p => p.name) ?? '*');
             return qb.execute('run', false);
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];

package/index.mjs

@@ -175,6 +175,7 @@ export const TinyIntType = mod.TinyIntType;
 export const TransactionContext = mod.TransactionContext;
 export const TransactionEventBroadcaster = mod.TransactionEventBroadcaster;
 export const Type = mod.Type;
+export const Uint8ArrayType = mod.Uint8ArrayType;
 export const UnderscoreNamingStrategy = mod.UnderscoreNamingStrategy;
 export const Unique = mod.Unique;
 export const UniqueConstraintViolationException = mod.UniqueConstraintViolationException;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.85",
+  "version": "6.0.0-dev.87",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.7.10"
+    "@mikro-orm/core": "^5.7.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.85"
+    "@mikro-orm/core": "~6.0.0-dev.87"
   }
 }

package/query/enums.js

@@ -9,4 +9,4 @@ var QueryType;
     QueryType["INSERT"] = "INSERT";
     QueryType["UPDATE"] = "UPDATE";
     QueryType["DELETE"] = "DELETE";
-})(QueryType = exports.QueryType || (exports.QueryType = {}));
+})(QueryType || (exports.QueryType = QueryType = {}));