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

package/package.json

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

package/schema/SqlSchemaGenerator.d.ts

@@ -1,4 +1,4 @@
-import { AbstractSchemaGenerator, type MikroORM, type ISchemaGenerator } from '@mikro-orm/core';
+import { AbstractSchemaGenerator, type MikroORM, type ISchemaGenerator, type ClearDatabaseOptions, type CreateSchemaOptions, type EnsureDatabaseOptions, type DropSchemaOptions, type UpdateSchemaOptions } from '@mikro-orm/core';
 import type { SchemaDifference } from '../typings';
 import { DatabaseSchema } from './DatabaseSchema';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';
@@ -7,56 +7,20 @@ export declare class SqlSchemaGenerator extends AbstractSchemaGenerator<Abstract
     private readonly options;
     protected lastEnsuredDatabase?: string;
     static register(orm: MikroORM): void;
-    createSchema(options?: {
-        wrap?: boolean;
-        schema?: string;
-    }): Promise<void>;
+    createSchema(options?: CreateSchemaOptions): Promise<void>;
     /**
      * Returns true if the database was created.
      */
-    ensureDatabase(): Promise<boolean>;
+    ensureDatabase(options?: EnsureDatabaseOptions): Promise<boolean>;
     getTargetSchema(schema?: string): DatabaseSchema;
-    getCreateSchemaSQL(options?: {
-        wrap?: boolean;
-        schema?: string;
-    }): Promise<string>;
-    dropSchema(options?: {
-        wrap?: boolean;
-        dropMigrationsTable?: boolean;
-        dropDb?: boolean;
-        schema?: string;
-    }): Promise<void>;
-    clearDatabase(options?: {
-        schema?: string;
-        truncate?: boolean;
-    }): Promise<void>;
-    getDropSchemaSQL(options?: {
-        wrap?: boolean;
-        dropMigrationsTable?: boolean;
-        schema?: string;
-    }): Promise<string>;
+    getCreateSchemaSQL(options?: CreateSchemaOptions): Promise<string>;
+    dropSchema(options?: DropSchemaOptions): Promise<void>;
+    clearDatabase(options?: ClearDatabaseOptions): Promise<void>;
+    getDropSchemaSQL(options?: Omit<DropSchemaOptions, 'dropDb'>): Promise<string>;
     private getSchemaName;
-    updateSchema(options?: {
-        wrap?: boolean;
-        safe?: boolean;
-        dropTables?: boolean;
-        fromSchema?: DatabaseSchema;
-        schema?: string;
-    }): Promise<void>;
-    getUpdateSchemaSQL(options?: {
-        wrap?: boolean;
-        safe?: boolean;
-        dropTables?: boolean;
-        fromSchema?: DatabaseSchema;
-        schema?: string;
-    }): Promise<string>;
-    getUpdateSchemaMigrationSQL(options?: {
-        wrap?: boolean;
-        safe?: boolean;
-        dropTables?: boolean;
-        fromSchema?: DatabaseSchema;
-        schema?: string;
-    }): Promise<{
+    updateSchema(options?: UpdateSchemaOptions<DatabaseSchema>): Promise<void>;
+    getUpdateSchemaSQL(options?: UpdateSchemaOptions<DatabaseSchema>): Promise<string>;
+    getUpdateSchemaMigrationSQL(options?: UpdateSchemaOptions<DatabaseSchema>): Promise<{
         up: string;
         down: string;
     }>;

package/schema/SqlSchemaGenerator.js

@@ -19,7 +19,7 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
     /**
      * Returns true if the database was created.
      */
-    async ensureDatabase() {
+    async ensureDatabase(options) {
         const dbName = this.config.get('dbName');
         if (this.lastEnsuredDatabase === dbName) {
             return true;
@@ -32,8 +32,14 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
             await this.createDatabase(dbName);
             this.config.set('dbName', dbName);
             await this.driver.reconnect();
+            if (options?.create) {
+                await this.createSchema(options);
+            }
             return true;
         }
+        if (options?.clear) {
+            await this.clearDatabase(options);
+        }
         return false;
     }
     getTargetSchema(schema) {