@mikro-orm/knex 6.3.11-dev.2 → 6.3.11-dev.21

package/AbstractSqlDriver.js

@@ -261,7 +261,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 else if (prop.runtimeType === 'Date') {
                     const alias = `${relationAlias}__${prop.fieldNames[0]}`;
                     const value = root[alias];
-                    if (tz && tz !== 'local' && typeof value === 'string' && !value.includes('+') && !value.endsWith('Z')) {
+                    if (tz && tz !== 'local' && typeof value === 'string' && !value.includes('+') && value.lastIndexOf('-') < 11 && !value.endsWith('Z')) {
                         relationPojo[prop.name] = this.platform.parseDate(value + tz);
                     }
                     else if (['string', 'number'].includes(typeof value)) {
@@ -562,7 +562,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             params.push(value);
         };
         for (const key of keys) {
-            const prop = meta.properties[key];
+            const prop = meta.properties[key] ?? meta.root.properties[key];
             prop.fieldNames.forEach((fieldName, fieldNameIdx) => {
                 if (fields.has(fieldName)) {
                     return;
@@ -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/README.md

@@ -164,6 +164,7 @@ You can find example integrations for some popular frameworks in the [`mikro-orm
 - [Accounts.js REST and GraphQL authentication + SQLite](https://github.com/darkbasic/mikro-orm-accounts-example)
 - [Nest + Shopify + PostgreSQL + GraphQL](https://github.com/Cloudshelf/Shopify_CSConnector)
 - [Elysia.js + libSQL + Bun](https://github.com/mikro-orm/elysia-bun-example-app)
+- [Electron.js + PostgreSQL](https://github.com/adnanlah/electron-mikro-orm-example-app)
 
 ### JavaScript Examples 
 

package/dialects/mysql/MySqlColumnCompiler.d.ts

@@ -1,9 +1,7 @@
 import BaseMySqlColumnCompiler from 'knex/lib/dialects/mysql/schema/mysql-columncompiler';
+import type { IncrementOptions } from '../../typings';
 export declare class MySqlColumnCompiler extends BaseMySqlColumnCompiler {
-    increments(this: any, options?: {
-        primaryKey: boolean;
-    }): string;
-    bigincrements(this: any, options?: {
-        primaryKey: boolean;
-    }): string;
+    increments(options: IncrementOptions): string;
+    bigincrements(options: IncrementOptions): string;
+    private generateDDL;
 }

package/dialects/mysql/MySqlColumnCompiler.js

@@ -8,12 +8,19 @@ exports.MySqlColumnCompiler = void 0;
 const mysql_columncompiler_1 = __importDefault(require("knex/lib/dialects/mysql/schema/mysql-columncompiler"));
 class MySqlColumnCompiler extends mysql_columncompiler_1.default {
     // we need the old behaviour to be able to add auto_increment to a column that is already PK
-    increments(options = { primaryKey: true }) {
-        return 'int unsigned not null auto_increment' + (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '');
+    increments(options) {
+        return this.generateDDL(options);
     }
     /* istanbul ignore next */
-    bigincrements(options = { primaryKey: true }) {
-        return 'bigint unsigned not null auto_increment' + (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '');
+    bigincrements(options) {
+        return this.generateDDL(options);
+    }
+    generateDDL(options = {}) {
+        const { primaryKey = true, unsigned = true, type = 'int' } = options;
+        return type
+            + (unsigned ? ' unsigned' : '')
+            + ' not null auto_increment'
+            + (this.tableCompiler._canBeAddPrimaryKey({ primaryKey }) ? ' primary key' : '');
     }
 }
 exports.MySqlColumnCompiler = MySqlColumnCompiler;

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -4,7 +4,6 @@ import { type Dictionary, type Type } from '@mikro-orm/core';
 import type { AbstractSqlConnection } from '../../AbstractSqlConnection';
 import { SchemaHelper } from '../../schema/SchemaHelper';
 import type { DatabaseSchema } from '../../schema/DatabaseSchema';
-import type { DatabaseTable } from '../../schema/DatabaseTable';
 export declare class MySqlSchemaHelper extends SchemaHelper {
     private readonly _cache;
     static readonly DEFAULT_VALUES: {
@@ -27,8 +26,6 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     getRenameColumnSQL(tableName: string, oldColumnName: string, to: Column): string;
     getRenameIndexSQL(tableName: string, index: IndexDef, oldIndexName: string): string;
     getChangeColumnCommentSQL(tableName: string, to: Column, schemaName?: string): string;
-    createTableColumn(table: Knex.TableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>): Knex.ColumnBuilder | undefined;
-    configureColumn(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     private getColumnDeclarationSQL;
     getForeignKeysSQL(tableName: string, schemaName?: string): string;
     getAllEnumDefinitions(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<Dictionary<string[]>>>;

package/dialects/mysql/MySqlSchemaHelper.js

@@ -208,18 +208,6 @@ class MySqlSchemaHelper extends SchemaHelper_1.SchemaHelper {
         const columnName = this.platform.quoteIdentifier(to.name);
         return `alter table ${tableName} modify ${columnName} ${this.getColumnDeclarationSQL(to)}`;
     }
-    createTableColumn(table, column, fromTable, changedProperties) {
-        if (column.mappedType instanceof core_1.MediumIntType) {
-            return table.specificType(column.name, this.getColumnDeclarationSQL(column, true));
-        }
-        return super.createTableColumn(table, column, fromTable, changedProperties);
-    }
-    configureColumn(column, col, knex, changedProperties) {
-        if (column.mappedType instanceof core_1.MediumIntType) {
-            return col;
-        }
-        return super.configureColumn(column, col, knex, changedProperties);
-    }
     getColumnDeclarationSQL(col, addPrimary = false) {
         let ret = col.type;
         ret += col.unsigned ? ' unsigned' : '';

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.2",
+  "version": "6.3.11-dev.21",
   "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.2",
+    "@mikro-orm/core": "6.3.11-dev.21",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

package/schema/DatabaseTable.js

@@ -96,7 +96,7 @@ class DatabaseTable {
                 extra: prop.extra,
                 ignoreSchemaChanges: prop.ignoreSchemaChanges,
             };
-            this.columns[field].unsigned ||= this.columns[field].autoincrement;
+            this.columns[field].unsigned ??= this.columns[field].autoincrement;
             const defaultValue = this.platform.getSchemaHelper().normalizeDefaultValue(prop.defaultRaw, prop.length);
             this.columns[field].default = defaultValue;
         });

package/schema/SchemaHelper.d.ts

@@ -2,7 +2,7 @@ import { type Connection, type Dictionary } from '@mikro-orm/core';
 import type { Knex } from 'knex';
 import type { AbstractSqlConnection } from '../AbstractSqlConnection';
 import type { AbstractSqlPlatform } from '../AbstractSqlPlatform';
-import type { CheckDef, Column, ForeignKey, IndexDef, Table, TableDifference } from '../typings';
+import type { CheckDef, Column, ExpandedTableBuilder, ForeignKey, IndexDef, Table, TableDifference } from '../typings';
 import type { DatabaseSchema } from './DatabaseSchema';
 import type { DatabaseTable } from './DatabaseTable';
 export declare abstract class SchemaHelper {
@@ -30,7 +30,7 @@ export declare abstract class SchemaHelper {
     getRenameIndexSQL(tableName: string, index: IndexDef, oldIndexName: string): string;
     getDropColumnsSQL(tableName: string, columns: Column[], schemaName?: string): string;
     hasNonDefaultPrimaryKeyName(table: DatabaseTable): boolean;
-    createTableColumn(table: Knex.TableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>, alter?: boolean): Knex.ColumnBuilder | undefined;
+    createTableColumn(table: ExpandedTableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>, alter?: boolean): Knex.ColumnBuilder | undefined;
     configureColumn(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     configureColumnDefault(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string;

package/schema/SchemaHelper.js

@@ -126,12 +126,12 @@ class SchemaHelper {
     }
     createTableColumn(table, column, fromTable, changedProperties, alter) {
         const compositePK = fromTable.getPrimaryKey()?.composite;
-        if (column.autoincrement && !column.generated && !compositePK && (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
+        if (column.autoincrement && !column.generated && !compositePK && column.primary) {
             const primaryKey = !changedProperties && !this.hasNonDefaultPrimaryKeyName(fromTable);
             if (column.mappedType instanceof core_1.BigIntType) {
-                return table.bigIncrements(column.name, { primaryKey });
+                return table.bigIncrements(column.name, { primaryKey, unsigned: column.unsigned, type: column.type });
             }
-            return table.increments(column.name, { primaryKey });
+            return table.increments(column.name, { primaryKey, unsigned: column.unsigned, type: column.type });
         }
         if (column.mappedType instanceof core_1.EnumType && column.enumItems?.every(item => core_1.Utils.isString(item))) {
             return table.enum(column.name, column.enumItems);

package/typings.d.ts

@@ -185,4 +185,13 @@ export interface ICriteriaNode<T extends object> {
     getPath(addIndex?: boolean): string;
     getPivotPath(path: string): string;
 }
+export type IncrementOptions = {
+    primaryKey?: boolean;
+    unsigned?: boolean;
+    type?: Column['type'];
+};
+export interface ExpandedTableBuilder extends Knex.TableBuilder {
+    increments(columnName?: string, options?: IncrementOptions): Knex.ColumnBuilder;
+    bigIncrements(columnName?: string, options?: IncrementOptions): Knex.ColumnBuilder;
+}
 export {};