@mikro-orm/knex 7.0.0-dev.42 → 7.0.0-dev.43

package/AbstractSqlConnection.d.ts

@@ -6,7 +6,9 @@ export declare abstract class AbstractSqlConnection extends Connection {
     protected platform: AbstractSqlPlatform;
     protected client: Kysely<any>;
     abstract createKyselyDialect(overrides: Dictionary): MaybePromise<Dialect>;
-    connect(): Promise<void>;
+    connect(options?: {
+        skipOnConnect?: boolean;
+    }): Promise<void>;
     /**
      * @inheritDoc
      */

package/AbstractSqlConnection.js

@@ -4,7 +4,7 @@ import { Connection, EventType, RawQueryFragment, Utils, } from '@mikro-orm/core
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export class AbstractSqlConnection extends Connection {
     client;
-    async connect() {
+    async connect(options) {
         let driverOptions = this.options.driverOptions ?? this.config.get('driverOptions');
         if (typeof driverOptions === 'function') {
             driverOptions = await driverOptions();
@@ -23,6 +23,9 @@ export class AbstractSqlConnection extends Connection {
             });
         }
         this.connected = true;
+        if (options?.skipOnConnect !== true) {
+            await this.onConnect();
+        }
     }
     /**
      * @inheritDoc

package/dialects/sqlite/BaseSqliteConnection.d.ts

@@ -1,5 +1,7 @@
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export declare abstract class BaseSqliteConnection extends AbstractSqlConnection {
-    connect(simple?: boolean): Promise<void>;
-    getClientUrl(): string;
+    connect(options?: {
+        skipOnConnect?: boolean;
+        simple?: boolean;
+    }): Promise<void>;
 }

package/dialects/sqlite/BaseSqliteConnection.js

@@ -3,9 +3,9 @@ import { CompiledQuery } from 'kysely';
 import { Utils } from '@mikro-orm/core';
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export class BaseSqliteConnection extends AbstractSqlConnection {
-    async connect(simple = false) {
+    async connect(options) {
         await super.connect();
-        if (simple) {
+        if (options?.simple) {
             return;
         }
         const dbName = this.config.get('dbName');
@@ -14,7 +14,4 @@ export class BaseSqliteConnection extends AbstractSqlConnection {
         }
         await this.client.executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
     }
-    getClientUrl() {
-        return '';
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.42",
+  "version": "7.0.0-dev.43",
   "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.",
   "type": "module",
   "exports": {
@@ -57,6 +57,6 @@
     "@mikro-orm/core": "^6.6.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.42"
+    "@mikro-orm/core": "7.0.0-dev.43"
   }
 }

package/schema/SqlSchemaGenerator.d.ts

@@ -48,7 +48,9 @@ export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<Abstract
     /**
      * creates new database and connects to it
      */
-    createDatabase(name?: string): Promise<void>;
+    createDatabase(name?: string, options?: {
+        skipOnConnect?: boolean;
+    }): Promise<void>;
     dropDatabase(name?: string): Promise<void>;
     execute(sql: string, options?: {
         wrap?: boolean;

package/schema/SqlSchemaGenerator.js

@@ -27,10 +27,8 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
             const managementDbName = this.helper.getManagementDbName();
             if (managementDbName) {
                 this.config.set('dbName', managementDbName);
-                await this.driver.reconnect();
-                await this.createDatabase(dbName);
-                this.config.set('dbName', dbName);
-                await this.driver.reconnect();
+                await this.driver.reconnect({ skipOnConnect: true });
+                await this.createDatabase(dbName, { skipOnConnect: true });
             }
             if (options?.create) {
                 await this.createSchema(options);
@@ -38,7 +36,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
             return true;
         }
         if (options?.clear) {
-            await this.clearDatabase(options);
+            await this.clearDatabase({ ...options, clearIdentityMap: false });
         }
         return false;
     }
@@ -120,7 +118,9 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
                 .execute();
         }
         await this.execute(this.helper.enableForeignKeysSQL());
-        this.clearIdentityMap();
+        if (options?.clearIdentityMap ?? true) {
+            this.clearIdentityMap();
+        }
     }
     async getDropSchemaSQL(options = {}) {
         await this.ensureDatabase();
@@ -289,14 +289,14 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator {
     /**
      * creates new database and connects to it
      */
-    async createDatabase(name) {
+    async createDatabase(name, options) {
         name ??= this.config.get('dbName');
         const sql = this.helper.getCreateDatabaseSQL('' + this.platform.quoteIdentifier(name));
         if (sql) {
             await this.execute(sql);
         }
         this.config.set('dbName', name);
-        await this.driver.reconnect();
+        await this.driver.reconnect(options);
     }
     async dropDatabase(name) {
         name ??= this.config.get('dbName');