@mikro-orm/knex 6.3.13-dev.2 → 6.3.13-dev.4

package/dialects/mysql/MySqlColumnCompiler.d.ts

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

package/dialects/mysql/MySqlSchemaHelper.d.ts

@@ -1,9 +1,10 @@
 import type { Knex } from 'knex';
-import type { CheckDef, Column, IndexDef, TableDifference, Table, ForeignKey } from '../../typings';
+import type { CheckDef, Column, IndexDef, TableDifference, Table, ForeignKey, MySqlTableBuilder } from '../../typings';
 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: {
@@ -22,6 +23,7 @@ export declare class MySqlSchemaHelper extends SchemaHelper {
     getAllChecks(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<CheckDef[]>>;
     getAllForeignKeys(connection: AbstractSqlConnection, tables: Table[]): Promise<Dictionary<Dictionary<ForeignKey>>>;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string;
+    createTableColumn(table: MySqlTableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>, alter?: boolean): Knex.ColumnBuilder | undefined;
     configureColumnDefault(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     getRenameColumnSQL(tableName: string, oldColumnName: string, to: Column): string;
     getRenameIndexSQL(tableName: string, index: IndexDef, oldIndexName: string): string;

package/dialects/mysql/MySqlSchemaHelper.js

@@ -180,6 +180,24 @@ class MySqlSchemaHelper extends SchemaHelper_1.SchemaHelper {
             .map(col => `alter table \`${tableDiff.name}\` modify \`${col.name}\` ${this.getColumnDeclarationSQL({ ...col, autoincrement: false })}`)
             .join(';\n');
     }
+    createTableColumn(table, column, fromTable, changedProperties, alter) {
+        const compositePK = fromTable.getPrimaryKey()?.composite;
+        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, unsigned: column.unsigned, type: column.type });
+            }
+            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);
+        }
+        let columnType = column.type;
+        if (column.generated) {
+            columnType += ` generated always as ${column.generated}`;
+        }
+        return table.specificType(column.name, columnType);
+    }
     configureColumnDefault(column, col, knex, changedProperties) {
         if (changedProperties || column.default !== undefined) {
             if (column.default == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.13-dev.2",
+  "version": "6.3.13-dev.4",
   "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.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.13-dev.2",
+    "@mikro-orm/core": "6.3.13-dev.4",
     "better-sqlite3": "*",
     "libsql": "*",
     "mariadb": "*"

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, ExpandedTableBuilder, ForeignKey, IndexDef, Table, TableDifference } from '../typings';
+import type { CheckDef, Column, 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: ExpandedTableBuilder, column: Column, fromTable: DatabaseTable, changedProperties?: Set<string>, alter?: boolean): Knex.ColumnBuilder | undefined;
+    createTableColumn(table: Knex.TableBuilder, 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 && column.primary) {
+        if (column.autoincrement && !column.generated && !compositePK && (!changedProperties || changedProperties.has('autoincrement') || changedProperties.has('type'))) {
             const primaryKey = !changedProperties && !this.hasNonDefaultPrimaryKeyName(fromTable);
             if (column.mappedType instanceof core_1.BigIntType) {
-                return table.bigIncrements(column.name, { primaryKey, unsigned: column.unsigned, type: column.type });
+                return table.bigIncrements(column.name, { primaryKey });
             }
-            return table.increments(column.name, { primaryKey, unsigned: column.unsigned, type: column.type });
+            return table.increments(column.name, { primaryKey });
         }
         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,13 +185,13 @@ export interface ICriteriaNode<T extends object> {
     getPath(addIndex?: boolean): string;
     getPivotPath(path: string): string;
 }
-export type IncrementOptions = {
+export type MySqlIncrementOptions = {
     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 interface MySqlTableBuilder extends Knex.TableBuilder {
+    increments(columnName?: string, options?: MySqlIncrementOptions): Knex.ColumnBuilder;
+    bigIncrements(columnName?: string, options?: MySqlIncrementOptions): Knex.ColumnBuilder;
 }
 export {};