@mikro-orm/migrations 6.4.7-dev.1 → 7.0.0-dev.0

package/Migration.d.ts

@@ -1,11 +1,11 @@
-import type { Configuration, Transaction } from '@mikro-orm/core';
-import type { AbstractSqlDriver, Knex, EntityManager } from '@mikro-orm/knex';
-export type Query = string | Knex.QueryBuilder | Knex.Raw;
+import { type Configuration, type RawQueryFragment, type Transaction } from '@mikro-orm/core';
+import type { AbstractSqlDriver, EntityManager, NativeQueryBuilder } from '@mikro-orm/knex';
+export type Query = string | NativeQueryBuilder | RawQueryFragment;
 export declare abstract class Migration {
     protected readonly driver: AbstractSqlDriver;
     protected readonly config: Configuration;
     private readonly queries;
-    protected ctx?: Transaction<Knex.Transaction>;
+    protected ctx?: Transaction;
     private em?;
     constructor(driver: AbstractSqlDriver, config: Configuration);
     abstract up(): Promise<void> | void;
@@ -15,11 +15,10 @@ export declare abstract class Migration {
     reset(): void;
     setTransactionContext(ctx: Transaction): void;
     /**
-     * Executes a raw SQL query. Accepts a string SQL or a knex query builder instance.
+     * Executes a raw SQL query. Accepts a string SQL, `raw()` SQL fragment, or a native query builder instance.
      * The `params` parameter is respected only if you use string SQL in the first parameter.
      */
     execute(sql: Query, params?: unknown[]): Promise<import("@mikro-orm/core").EntityData<Partial<any>>[]>;
-    getKnex(): Knex<any, any[]>;
     /**
      * Creates a cached `EntityManager` instance for this migration, which will respect
      * the current transaction context.

package/Migration.js

@@ -28,15 +28,12 @@ class Migration {
         this.ctx = ctx;
     }
     /**
-     * Executes a raw SQL query. Accepts a string SQL or a knex query builder instance.
+     * Executes a raw SQL query. Accepts a string SQL, `raw()` SQL fragment, or a native query builder instance.
      * The `params` parameter is respected only if you use string SQL in the first parameter.
      */
     async execute(sql, params) {
         return this.driver.execute(sql, params, 'all', this.ctx);
     }
-    getKnex() {
-        return this.driver.getConnection('write').getKnex();
-    }
     /**
      * Creates a cached `EntityManager` instance for this migration, which will respect
      * the current transaction context.

package/MigrationStorage.d.ts

@@ -1,5 +1,5 @@
 import type { MigrationsOptions, Transaction } from '@mikro-orm/core';
-import type { AbstractSqlDriver } from '@mikro-orm/knex';
+import { type AbstractSqlDriver } from '@mikro-orm/knex';
 import type { MigrationParams, UmzugStorage } from 'umzug';
 import type { MigrationRow } from './typings';
 export declare class MigrationStorage implements UmzugStorage {
@@ -8,6 +8,7 @@ export declare class MigrationStorage implements UmzugStorage {
     private readonly connection;
     private readonly helper;
     private masterTransaction?;
+    private readonly platform;
     constructor(driver: AbstractSqlDriver, options: MigrationsOptions);
     executed(): Promise<string[]>;
     logMigration(params: MigrationParams<any>): Promise<void>;
@@ -27,5 +28,4 @@ export declare class MigrationStorage implements UmzugStorage {
         tableName: string;
         schemaName: string;
     };
-    private get knex();
 }

package/MigrationStorage.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationStorage = void 0;
+const knex_1 = require("@mikro-orm/knex");
 const path = __importStar(require("node:path"));
 class MigrationStorage {
     driver;
@@ -41,11 +42,13 @@ class MigrationStorage {
     connection;
     helper;
     masterTransaction;
+    platform;
     constructor(driver, options) {
         this.driver = driver;
         this.options = options;
         this.connection = this.driver.getConnection();
-        this.helper = this.driver.getPlatform().getSchemaHelper();
+        this.platform = this.driver.getPlatform();
+        this.helper = this.platform.getSchemaHelper();
     }
     async executed() {
         const migrations = await this.getExecutedMigrations();
@@ -60,19 +63,14 @@ class MigrationStorage {
         const { tableName, schemaName } = this.getTableName();
         const withoutExt = this.getMigrationName(params.name);
         const names = [withoutExt, withoutExt + '.js', withoutExt + '.ts'];
-        const qb = this.knex.delete().from(tableName).withSchema(schemaName).where('name', 'in', [params.name, ...names]);
-        if (this.masterTransaction) {
-            qb.transacting(this.masterTransaction);
-        }
-        await this.connection.execute(qb);
+        await this.driver.nativeDelete(tableName, { name: { $in: [params.name, ...names] } }, { schema: schemaName, ctx: this.masterTransaction });
     }
     async getExecutedMigrations() {
         const { tableName, schemaName } = this.getTableName();
-        const qb = this.knex.select('*').from(tableName).withSchema(schemaName).orderBy('id', 'asc');
-        if (this.masterTransaction) {
-            qb.transacting(this.masterTransaction);
-        }
-        const res = await this.connection.execute(qb);
+        const res = await this.driver.createQueryBuilder(tableName, this.masterTransaction)
+            .withSchema(schemaName)
+            .orderBy({ id: 'asc' })
+            .execute();
         return res.map(row => {
             if (typeof row.executed_at === 'string') {
                 row.executed_at = new Date(row.executed_at);
@@ -91,11 +89,29 @@ class MigrationStorage {
             const sql = this.helper.getCreateNamespaceSQL(schemaName);
             await this.connection.execute(sql);
         }
-        await this.knex.schema.createTable(tableName, table => {
-            table.increments();
-            table.string('name');
-            table.dateTime('executed_at').defaultTo(this.knex.fn.now());
-        }).withSchema(schemaName);
+        const table = new knex_1.DatabaseTable(this.platform, tableName, schemaName);
+        table.addColumn({
+            name: 'id',
+            type: this.platform.getIntegerTypeDeclarationSQL({ autoincrement: true, unsigned: true }),
+            mappedType: this.platform.getMappedType('number'),
+            primary: true,
+            autoincrement: true,
+        });
+        table.addColumn({
+            name: 'name',
+            type: this.platform.getVarcharTypeDeclarationSQL({}),
+            mappedType: this.platform.getMappedType('string'),
+        });
+        const length = this.platform.getDefaultDateTimeLength();
+        table.addColumn({
+            name: 'executed_at',
+            type: this.platform.getDateTimeTypeDeclarationSQL({ length }),
+            mappedType: this.platform.getMappedType('datetime'),
+            default: this.platform.getCurrentTimestampSQL(length),
+            length,
+        });
+        const sql = this.helper.createTable(table);
+        await this.connection.execute(sql.join(';\n'));
     }
     setMasterMigration(trx) {
         this.masterTransaction = trx;
@@ -123,8 +139,5 @@ class MigrationStorage {
         const schemaName = parts.length > 1 ? parts[0] : this.driver.config.get('schema', this.driver.getPlatform().getDefaultSchemaName());
         return { tableName, schemaName };
     }
-    get knex() {
-        return this.connection.getKnex();
-    }
 }
 exports.MigrationStorage = MigrationStorage;

package/README.md

@@ -183,7 +183,6 @@ yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-yarn add @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 
@@ -196,7 +195,6 @@ npm i -s @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 npm i -s @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 npm i -s @mikro-orm/core @mikro-orm/mssql         # for mssql
 npm i -s @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-npm i -s @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 npm i -s @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/migrations",
-  "version": "6.4.7-dev.1",
+  "version": "7.0.0-dev.0",
   "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",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 18.12.0"
+    "node": ">= 22.11.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
@@ -58,14 +58,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.4.7-dev.1",
+    "@mikro-orm/knex": "7.0.0-dev.0",
     "fs-extra": "11.3.0",
     "umzug": "3.8.2"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.6"
+    "@mikro-orm/core": "^6.4.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.1"
+    "@mikro-orm/core": "7.0.0-dev.0"
   }
 }