@mikro-orm/knex 6.3.11-dev.14 → 6.3.11-dev.15

package/dialects/mysql/MySqlColumnCompiler.d.ts

@@ -2,8 +2,10 @@ import BaseMySqlColumnCompiler from 'knex/lib/dialects/mysql/schema/mysql-column
 export declare class MySqlColumnCompiler extends BaseMySqlColumnCompiler {
     increments(this: any, options?: {
         primaryKey: boolean;
+        unsigned: boolean;
     }): string;
     bigincrements(this: any, options?: {
         primaryKey: boolean;
+        unsigned: boolean;
     }): string;
 }

package/dialects/mysql/MySqlColumnCompiler.js

@@ -8,12 +8,14 @@ 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 = { primaryKey: true, unsigned: true }) {
+        const type = options.unsigned ? 'int unsigned' : 'int';
+        return `${type} not null auto_increment` + (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '');
     }
     /* istanbul ignore next */
-    bigincrements(options = { primaryKey: true }) {
-        return 'bigint unsigned not null auto_increment' + (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '');
+    bigincrements(options = { primaryKey: true, unsigned: true }) {
+        const type = options.unsigned ? 'bigint unsigned' : 'bigint';
+        return `${type} not null auto_increment` + (this.tableCompiler._canBeAddPrimaryKey(options) ? ' primary key' : '');
     }
 }
 exports.MySqlColumnCompiler = MySqlColumnCompiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.3.11-dev.14",
+  "version": "6.3.11-dev.15",
   "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.14",
+    "@mikro-orm/core": "6.3.11-dev.15",
     "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

@@ -129,9 +129,9 @@ class SchemaHelper {
         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 });
+                return table.bigIncrements(column.name, { primaryKey, unsigned: column.unsigned });
             }
-            return table.increments(column.name, { primaryKey });
+            return table.increments(column.name, { primaryKey, unsigned: column.unsigned });
         }
         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,14 @@ export interface ICriteriaNode<T extends object> {
     getPath(addIndex?: boolean): string;
     getPivotPath(path: string): string;
 }
+export interface ExpandedTableBuilder extends Knex.TableBuilder {
+    increments(columnName?: string, options?: {
+        primaryKey?: boolean;
+        unsigned?: boolean;
+    }): Knex.ColumnBuilder;
+    bigIncrements(columnName?: string, options?: {
+        primaryKey?: boolean;
+        unsigned?: boolean;
+    }): Knex.ColumnBuilder;
+}
 export {};