@mikro-orm/knex 6.0.0-dev.317 → 6.0.0-dev.319

package/AbstractSqlConnection.js

@@ -37,13 +37,8 @@ class AbstractSqlConnection extends core_1.Connection {
      * @inheritDoc
      */
     async isConnected() {
-        try {
-            await this.getKnex().raw('select 1');
-            return true;
-        }
-        catch {
-            return false;
-        }
+        const check = await this.checkConnection();
+        return check.ok;
     }
     /**
      * @inheritDoc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.317",
+  "version": "6.0.0-dev.319",
   "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,6 +66,6 @@
     "@mikro-orm/core": "^5.0.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.0.0-dev.317"
+    "@mikro-orm/core": "6.0.0-dev.319"
   }
 }

package/schema/SqlSchemaGenerator.js

@@ -21,17 +21,20 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
      */
     async ensureDatabase(options) {
         const dbName = this.config.get('dbName');
-        if (this.lastEnsuredDatabase === dbName) {
+        if (this.lastEnsuredDatabase === dbName && !options?.forceCheck) {
             return true;
         }
         const exists = await this.helper.databaseExists(this.connection, dbName);
         this.lastEnsuredDatabase = dbName;
         if (!exists) {
-            this.config.set('dbName', this.helper.getManagementDbName());
-            await this.driver.reconnect();
-            await this.createDatabase(dbName);
-            this.config.set('dbName', dbName);
-            await this.driver.reconnect();
+            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();
+            }
             if (options?.create) {
                 await this.createSchema(options);
             }
@@ -376,7 +379,10 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
      * creates new database and connects to it
      */
     async createDatabase(name) {
-        await this.driver.execute(this.helper.getCreateDatabaseSQL('' + this.knex.ref(name)));
+        const sql = this.helper.getCreateDatabaseSQL('' + this.knex.ref(name));
+        if (sql) {
+            await this.driver.execute(sql);
+        }
         this.config.set('dbName', name);
         await this.driver.reconnect();
     }