@mikro-orm/sql 7.0.0-dev.98 → 7.0.0-dev.99

package/AbstractSqlConnection.d.ts

@@ -1,14 +1,15 @@
 import { type ControlledTransaction, type Dialect, Kysely } from 'kysely';
-import { type AnyEntity, Connection, type Dictionary, type EntityData, type IsolationLevel, type LogContext, type LoggingOptions, type MaybePromise, type QueryResult, RawQueryFragment, type Transaction, type TransactionEventBroadcaster } from '@mikro-orm/core';
+import { type AnyEntity, Connection, type Dictionary, type EntityData, type IsolationLevel, type LogContext, type LoggingOptions, type QueryResult, RawQueryFragment, type Transaction, type TransactionEventBroadcaster } from '@mikro-orm/core';
 import type { AbstractSqlPlatform } from './AbstractSqlPlatform.js';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export declare abstract class AbstractSqlConnection extends Connection {
+    #private;
     protected platform: AbstractSqlPlatform;
-    protected client: Kysely<any>;
-    abstract createKyselyDialect(overrides: Dictionary): MaybePromise<Dialect>;
+    abstract createKyselyDialect(overrides: Dictionary): Dialect;
     connect(options?: {
         skipOnConnect?: boolean;
     }): Promise<void>;
+    createKysely(): void;
     /**
      * @inheritDoc
      */

package/AbstractSqlConnection.js

@@ -2,37 +2,41 @@ import { CompiledQuery, Kysely } from 'kysely';
 import { Connection, EventType, RawQueryFragment, Utils, } from '@mikro-orm/core';
 import { NativeQueryBuilder } from './query/NativeQueryBuilder.js';
 export class AbstractSqlConnection extends Connection {
-    client;
+    #client;
     async connect(options) {
+        this.getClient();
+        this.connected = true;
+        if (options?.skipOnConnect !== true) {
+            await this.onConnect();
+        }
+    }
+    createKysely() {
         let driverOptions = this.options.driverOptions ?? this.config.get('driverOptions');
         if (typeof driverOptions === 'function') {
-            driverOptions = await driverOptions();
+            driverOptions = driverOptions();
         }
         if (driverOptions instanceof Kysely) {
             this.logger.log('info', 'Reusing Kysely client provided via `driverOptions`');
-            this.client = driverOptions;
+            this.#client = driverOptions;
         }
         else if ('createDriver' in driverOptions) {
             this.logger.log('info', 'Reusing Kysely dialect provided via `driverOptions`');
-            this.client = new Kysely({ dialect: driverOptions });
+            this.#client = new Kysely({ dialect: driverOptions });
         }
         else {
-            this.client = new Kysely({
-                dialect: await this.createKyselyDialect(driverOptions),
+            this.#client = new Kysely({
+                dialect: this.createKyselyDialect(driverOptions),
             });
         }
-        this.connected = true;
-        if (options?.skipOnConnect !== true) {
-            await this.onConnect();
-        }
     }
     /**
      * @inheritDoc
      */
     async close(force) {
         await super.close(force);
-        await this.client?.destroy();
+        await this.#client?.destroy();
         this.connected = false;
+        this.#client = undefined;
     }
     /**
      * @inheritDoc
@@ -49,7 +53,7 @@ export class AbstractSqlConnection extends Connection {
             return { ok: false, reason: 'Connection not established' };
         }
         try {
-            await this.client.executeQuery(CompiledQuery.raw('select 1'));
+            await this.getClient().executeQuery(CompiledQuery.raw('select 1'));
             return { ok: true };
         }
         catch (error) {
@@ -57,7 +61,10 @@ export class AbstractSqlConnection extends Connection {
         }
     }
     getClient() {
-        return this.client;
+        if (!this.#client) {
+            this.createKysely();
+        }
+        return this.#client;
     }
     async transactional(cb, options = {}) {
         const trx = await this.begin(options);
@@ -86,7 +93,7 @@ export class AbstractSqlConnection extends Connection {
         }
         await this.ensureConnection();
         await options.eventBroadcaster?.dispatchEvent(EventType.beforeTransactionStart);
-        let trxBuilder = this.client.startTransaction();
+        let trxBuilder = this.getClient().startTransaction();
         if (options.isolationLevel) {
             trxBuilder = trxBuilder.setIsolationLevel(options.isolationLevel);
         }
@@ -155,7 +162,7 @@ export class AbstractSqlConnection extends Connection {
         const sql = this.getSql(q.query, q.formatted, loggerContext);
         return this.executeQuery(sql, async () => {
             const compiled = CompiledQuery.raw(q.formatted);
-            const res = await (ctx ?? this.client).executeQuery(compiled);
+            const res = await (ctx ?? this.#client).executeQuery(compiled);
             return this.transformRawResult(res, method);
         }, { ...q, ...loggerContext });
     }
@@ -172,7 +179,7 @@ export class AbstractSqlConnection extends Connection {
             parameters: [],
         };
         try {
-            const res = (ctx ?? this.client).getExecutor().stream(compiled, 1);
+            const res = (ctx ?? this.getClient()).getExecutor().stream(compiled, 1);
             this.logQuery(sql, {
                 sql, params,
                 ...loggerContext,
@@ -198,7 +205,7 @@ export class AbstractSqlConnection extends Connection {
         const buf = await readFile(path);
         try {
             const raw = CompiledQuery.raw(buf.toString());
-            await this.client.executeQuery(raw);
+            await this.getClient().executeQuery(raw);
         }
         catch (e) {
             /* v8 ignore next */

package/dialects/sqlite/BaseSqliteConnection.js

@@ -3,6 +3,6 @@ import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export class BaseSqliteConnection extends AbstractSqlConnection {
     async connect(options) {
         await super.connect(options);
-        await this.client.executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
+        await this.getClient().executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.98",
+  "version": "7.0.0-dev.99",
   "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.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.98"
+    "@mikro-orm/core": "7.0.0-dev.99"
   }
 }