@mikro-orm/knex 6.1.13-dev.35 → 6.1.13-dev.37

package/AbstractSqlConnection.js

@@ -151,7 +151,7 @@ class AbstractSqlConnection extends core_1.Connection {
             client: type,
             connection: this.getConnectionOptions(),
             pool: this.config.get('pool'),
-        }, this.config.get('driverOptions'));
+        }, this.config.get('driverOptions'), this.options.driverOptions);
         const options = config.connection;
         const password = options.password;
         if (!(password instanceof Function)) {

package/AbstractSqlDriver.js

@@ -1092,7 +1092,9 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                     continue;
                 }
                 const order = typeof childOrder === 'object' ? childOrder[propName] : childOrder;
-                orderBy.push({ [`${propAlias}.${propName}`]: order });
+                if (order) {
+                    orderBy.push({ [`${propAlias}.${propName}`]: order });
+                }
             }
         }
         return orderBy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.1.13-dev.35",
+  "version": "6.1.13-dev.37",
   "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.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.1.13-dev.35"
+    "@mikro-orm/core": "6.1.13-dev.37"
   }
 }