@mikro-orm/knex 6.3.11-dev.1 → 6.3.11-dev.10

package/AbstractSqlDriver.js

@@ -912,15 +912,12 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
     getFieldsForJoinedLoad(qb, meta, explicitFields, exclude, populate = [], options, parentTableAlias, parentJoinPath) {
         const fields = [];
         const joinedProps = this.joinedProps(meta, populate, options);
-        if (explicitFields?.includes('*')) {
-            fields.push('*');
-        }
         const shouldHaveColumn = (prop, populate, fields) => {
             if (!this.platform.shouldHaveColumn(prop, populate, exclude)) {
                 return false;
             }
-            if (!fields || prop.primary) {
-                return !fields?.includes('*');
+            if (!fields || fields.includes('*') || prop.primary) {
+                return true;
             }
             return fields.some(f => f === prop.name || f.toString().startsWith(prop.name + '.'));
         };

package/AbstractSqlPlatform.d.ts

@@ -11,6 +11,7 @@ export declare abstract class AbstractSqlPlatform extends Platform {
     lookupExtensions(orm: MikroORM): void;
     getSchemaGenerator(driver: IDatabaseDriver, em?: EntityManager): SqlSchemaGenerator;
     quoteValue(value: any): string;
+    escape(value: any): string;
     getSearchJsonPropertySQL(path: string, type: string, aliased: boolean): string;
     getSearchJsonPropertyKey(path: string[], type: string, aliased: boolean, value?: unknown): string;
     getJsonIndexDefinition(index: IndexDef): string[];

package/AbstractSqlPlatform.js

@@ -34,11 +34,12 @@ class AbstractSqlPlatform extends core_1.Platform {
         if (this.isRaw(value)) {
             return value;
         }
-        /* istanbul ignore if */
         if (core_1.Utils.isPlainObject(value) || value?.[core_1.JsonProperty]) {
-            return (0, sqlstring_1.escape)(JSON.stringify(value));
+            return this.escape(JSON.stringify(value));
         }
-        // @ts-ignore
+        return this.escape(value);
+    }
+    escape(value) {
         return (0, sqlstring_1.escape)(value, true, this.timezone);
     }
     getSearchJsonPropertySQL(path, type, aliased) {

package/dialects/sqlite/BaseSqlitePlatform.d.ts

@@ -1,3 +1,4 @@
+import { type EntityProperty } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '../../AbstractSqlPlatform';
 export declare abstract class BaseSqlitePlatform extends AbstractSqlPlatform {
     usesDefaultKeyword(): boolean;
@@ -53,4 +54,6 @@ export declare abstract class BaseSqlitePlatform extends AbstractSqlPlatform {
     getDefaultPrimaryName(tableName: string, columns: string[]): string;
     supportsDownMigrations(): boolean;
     getFullTextWhereClause(): string;
+    quoteVersionValue(value: Date | number, prop: EntityProperty): Date | string | number;
+    quoteValue(value: any): string;
 }

package/dialects/sqlite/BaseSqlitePlatform.js

@@ -81,5 +81,17 @@ class BaseSqlitePlatform extends AbstractSqlPlatform_1.AbstractSqlPlatform {
     getFullTextWhereClause() {
         return `:column: match :query`;
     }
+    quoteVersionValue(value, prop) {
+        if (prop.runtimeType === 'Date') {
+            return this.escape(value).replace(/^'|\.\d{3}'$/g, '');
+        }
+        return value;
+    }
+    quoteValue(value) {
+        if (value instanceof Date) {
+            return '' + +value;
+        }
+        return super.quoteValue(value);
+    }
 }
 exports.BaseSqlitePlatform = BaseSqlitePlatform;

package/package.json

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