@entity-access/entity-access 1.0.488 → 1.0.489

package/src/drivers/postgres/PostgreSqlDriver.ts

@@ -6,6 +6,7 @@ import QueryCompiler from "../../compiler/QueryCompiler.js";
 import EntityType from "../../entity-query/EntityType.js";
 import Migrations from "../../migrations/Migrations.js";
 import PostgresAutomaticMigrations from "../../migrations/postgres/PostgresAutomaticMigrations.js";
+import EntityContext from "../../model/EntityContext.js";
 import DateTime from "../../types/DateTime.js";
 import { BaseConnection, BaseDriver, EntityTransaction, IDbConnectionString, IDbReader, IQuery, toQuery } from "../base/BaseDriver.js";
 import pg from "pg";
@@ -215,8 +216,8 @@ class PostgreSqlConnection extends BaseConnection {
     }
 
 
-    public automaticMigrations(): Migrations {
-        return new PostgresAutomaticMigrations(this.compiler);
+    public automaticMigrations(context: EntityContext): Migrations {
+        return new PostgresAutomaticMigrations(context);
     }
 
     async getColumnSchema(schema: string, table: string): Promise<IColumnSchema[]> {

package/src/drivers/sql-server/SqlServerDriver.ts

@@ -10,6 +10,7 @@ import TimedCache from "../../common/cache/TimedCache.js";
 import EntityType from "../../entity-query/EntityType.js";
 import DateTime from "../../types/DateTime.js";
 import IColumnSchema from "../../common/IColumnSchema.js";
+import type EntityContext from "../../model/EntityContext.js";
 
 export type ISqlServerConnectionString = IDbConnectionString & sql.config;
 
@@ -237,8 +238,8 @@ export class SqlServerConnection extends BaseConnection {
         return value;
     }
 
-    public automaticMigrations(): Migrations {
-        return new SqlServerAutomaticMigrations(this.sqlQueryCompiler);
+    public automaticMigrations(context: EntityContext): Migrations {
+        return new SqlServerAutomaticMigrations(context);
     }
 
     protected async createDbTransaction(): Promise<EntityTransaction> {

package/src/migrations/Migrations.ts

@@ -1,37 +1,51 @@
+import Logger, { ConsoleLogger } from "../common/Logger.js";
 import { modelSymbol } from "../common/symbols/symbols.js";
 import type QueryCompiler from "../compiler/QueryCompiler.js";
 import ICheckConstraint from "../decorators/ICheckConstraint.js";
 import { IColumn } from "../decorators/IColumn.js";
 import type { IForeignKeyConstraint } from "../decorators/IForeignKeyConstraint.js";
 import type { IIndex } from "../decorators/IIndex.js";
+import type { BaseConnection, IQuery, IQueryResult } from "../drivers/base/BaseDriver.js";
 import type EntityType from "../entity-query/EntityType.js";
 import type EntityContext from "../model/EntityContext.js";
 import type EntityQuery from "../model/EntityQuery.js";
 
 export default abstract class Migrations {
 
-    constructor(protected compiler: QueryCompiler) {}
+    logger: Logger;
 
-    public async migrate(context: EntityContext , {
+    constructor(
+        private context: EntityContext,
+        private connection: BaseConnection = context.connection,
+        protected compiler: QueryCompiler = context.driver.compiler
+    ) {
+
+    }
+
+    public async migrate({
         version,
         name = "default",
         historyTableName = "migrations",
+        log = new ConsoleLogger(false),
         seed,
         createIndexForForeignKeys = true
     }: {
         version?: string,
         name?: string,
-        historyTableName?:
-        string,
+        historyTableName?: string,
+        log?: Logger,
         seed?: (c: EntityContext) => Promise<any>,
         createIndexForForeignKeys?: boolean
     } = {} ) {
+        const { context } = this;
         const { model } = context;
+        this.logger = log ?? context.logger;
         const postMigration = [] as (() => Promise<void>)[];
 
         if (version) {
             // check if we have already stored this version...
             if(await this.hasVersion(context, name, version, historyTableName)) {
+                // eslint-disable-next-line no-console
                 console.warn(`Skipping migration, migration already exists for ${version}`);
                 return false;
             }
@@ -185,4 +199,10 @@ export default abstract class Migrations {
 
     abstract migrateCheckConstraint(context: EntityContext, checkConstraint: ICheckConstraint, type: EntityType);
 
+    protected executeQuery(command: IQuery, signal?: AbortSignal): Promise<IQueryResult> {
+        const text = typeof command === "string" ? command : command.text;
+        this.logger?.log(text);
+        return this.connection.executeQuery(command, signal);
+    }
+
 }

package/src/migrations/postgres/PostgresAutomaticMigrations.ts

@@ -5,8 +5,7 @@ import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js
 import { IIndex } from "../../decorators/IIndex.js";
 import { BaseConnection, BaseDriver } from "../../drivers/base/BaseDriver.js";
 import EntityType from "../../entity-query/EntityType.js";
-import EntityContext from "../../model/EntityContext.js";
-import Migrations from "../Migrations.js";
+import type EntityContext from "../../model/EntityContext.js";
 import PostgresMigrations from "./PostgresMigrations.js";
 
 export default class PostgresAutomaticMigrations extends PostgresMigrations {
@@ -83,7 +82,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
                 def += " DEFAULT " + iterator.default;
             }
 
-            await driver.executeQuery(def + ";");
+            await this.executeQuery(def + ";");
         }
 
     }
@@ -119,7 +118,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
             fields.push(def);
         }
 
-        await driver.executeQuery(`CREATE TABLE IF NOT EXISTS ${name} (${fields.join(",")}
+        await this.executeQuery(`CREATE TABLE IF NOT EXISTS ${name} (${fields.join(",")}
         ,CONSTRAINT PK_${name} PRIMARY KEY (${keys.map((x) => x.columnName).join(",")})
         )`);
 
@@ -142,7 +141,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
         if (index.filter) {
             query += ` WHERE (${index.filter})`;
         }
-        await driver.executeQuery(query);
+        await this.executeQuery(query);
     }
 
     async constraintExists(context: EntityContext, name: string, schema: string, table = "referential_constraints") {
@@ -159,7 +158,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
 
         const driver = context.connection;
 
-        const r = await driver.executeQuery({ text, values });
+        const r = await this.executeQuery({ text, values });
         if (r.rows?.length) {
             return true;
         }
@@ -218,9 +217,9 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
 
             await using tx = await driver.createTransaction();
             if (constraint.clearExisting && prepare) {
-                await driver.executeQuery(prepare);
+                await this.executeQuery(prepare);
             }
-            await driver.executeQuery(text);
+            await this.executeQuery(text);
             await tx.commit();
         } catch (error) {
             // we will simply ignore this
@@ -245,7 +244,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
         const text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} CHECK (${constraint.filter})`;
 
         try {
-            await driver.executeQuery(text);
+            await this.executeQuery(text);
         } catch (error) {
             // we will simply ignore this
             console.warn(`Failed adding constraint ${constraint.name}`);

package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts

@@ -3,11 +3,10 @@ import ICheckConstraint from "../../decorators/ICheckConstraint.js";
 import { IColumn } from "../../decorators/IColumn.js";
 import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
 import { IIndex } from "../../decorators/IIndex.js";
-import { BaseConnection, BaseDriver } from "../../drivers/base/BaseDriver.js";
+import { BaseConnection } from "../../drivers/base/BaseDriver.js";
 import { SqlServerLiteral } from "../../drivers/sql-server/SqlServerLiteral.js";
 import EntityType from "../../entity-query/EntityType.js";
-import EntityContext from "../../model/EntityContext.js";
-import Migrations from "../Migrations.js";
+import type EntityContext from "../../model/EntityContext.js";
 import SqlServerMigrations from "./SqlServerMigrations.js";
 
 export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
@@ -75,7 +74,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
 
             if (iterator.computed) {
                 def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
-                await driver.executeQuery(def + ";");
+                await this.executeQuery(def + ";");
                 continue;
             }
 
@@ -91,7 +90,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             if (typeof iterator.default === "string") {
                 def += " DEFAULT " + iterator.default;
             }
-            await driver.executeQuery(def + ";");
+            await this.executeQuery(def + ";");
         }
 
     }
@@ -123,7 +122,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             fields.push(def);
         }
 
-        await driver.executeQuery(`IF OBJECT_ID(${ SqlServerLiteral.escapeLiteral(name)}) IS NULL BEGIN
+        await this.executeQuery(`IF OBJECT_ID(${ SqlServerLiteral.escapeLiteral(name)}) IS NULL BEGIN
             CREATE TABLE ${name} (${fields.join(",")}
             , CONSTRAINT PK_${name} PRIMARY KEY(${keys.map((x) => x.quotedColumnName)})
             );
@@ -149,7 +148,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             query += ` WHERE (${index.filter})`;
         }
         query += `\nEND`;
-        await driver.executeQuery(query);
+        await this.executeQuery(query);
     }
 
     async constraintExists(context: EntityContext, name: string, schema: string, type: EntityType) {
@@ -164,7 +163,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
 
         const driver = context.connection;
 
-        const r = await driver.executeQuery(text);
+        const r = await this.executeQuery(text);
         if (r.rows?.length === 0) {
             if (r.rows["c1"] > 0) {
                 return true;
@@ -215,7 +214,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         }
 
         try {
-            await driver.executeQuery(text);
+            await this.executeQuery(text);
         } catch (error) {
             // we will simply ignore this
             console.warn(`Failed adding constraint ${constraint.name}`);
@@ -238,7 +237,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         const text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} CHECK (${constraint.filter})`;
 
         try {
-            await driver.executeQuery(text);
+            await this.executeQuery(text);
         } catch (error) {
             // we will simply ignore this
             console.warn(`Failed adding constraint ${constraint.name}`);

package/src/workflows/WorkflowStorage.ts

@@ -234,7 +234,7 @@ export default class WorkflowStorage {
     async seed(version?) {
         const db = new WorkflowDbContext(this.driver);
         await db.connection.ensureDatabase();
-        await db.connection.automaticMigrations().migrate(db, { version, name: "workflows" });
+        await db.connection.automaticMigrations(db).migrate({ log: null, version, name: "workflows" });
     }
 
 }