@entity-access/entity-access 1.0.488 → 1.0.490

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,11 +216,11 @@ 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[]> {
+    async getColumnSchema(schema: string): Promise<IColumnSchema[]> {
         const text = `
         select 
             column_name as "columnName",
@@ -242,11 +243,12 @@ class PostgreSqlConnection extends BaseConnection {
                 else null end as "identity",
             case
                 when is_generated = 'YES' then '() => 1'
-                else null end as "computed"
+                else null end as "computed",
+            table_name as "ownerName",
+            'table' as "ownerType"
             from information_schema.columns
-            where table_schema = $1
-            and table_name = $2`;
-        const r = await this.executeQuery({ text, values: [ schema, table ]});
+            where table_schema = $1`;
+        const r = await this.executeQuery({ text, values: [ schema ]});
         return r.rows;
     }
 

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;
 
@@ -128,7 +129,7 @@ export class SqlServerConnection extends BaseConnection {
         super(driver);
     }
 
-    async getColumnSchema(schema: string, table: string): Promise<IColumnSchema[]> {
+    async getColumnSchema(schema: string): Promise<IColumnSchema[]> {
         const text = `
                         SELECT
                 COLUMN_NAME as [name],
@@ -160,12 +161,13 @@ export class SqlServerConnection extends BaseConnection {
                     WHEN COLUMN_DEFAULT is NULL THEN ''
                     ELSE '() => ' + COLUMN_DEFAULT
                 END as [default],
-                ColumnProperty(OBJECT_ID(TABLE_SCHEMA+'.'+TABLE_NAME),COLUMN_NAME,'IsComputed') as [computed]
+                ColumnProperty(OBJECT_ID(TABLE_SCHEMA+'.'+TABLE_NAME),COLUMN_NAME,'IsComputed') as [computed],
+                TABLE_NAME as [ownerName],
+                'table' as [ownerType]
                 FROM INFORMATION_SCHEMA.COLUMNS
             WHERE TABLE_SCHEMA = $1
-            AND TABLE_NAME = $2
         `;
-        const r = await this.executeQuery({ text, values: [schema, table] });
+        const r = await this.executeQuery({ text, values: [schema] });
         return r.rows;
     }
 
@@ -237,8 +239,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/ExistingSchema.ts

@@ -0,0 +1,39 @@
+import IColumnSchema from "../common/IColumnSchema.js";
+import type { BaseConnection } from "../drivers/base/BaseDriver.js";
+
+export default class ExistingSchema {
+
+
+    public static async getSchema(connection: BaseConnection, schema: string, table: string, caseInsensitive = false) {
+        let s = this.cache.get(schema);
+        if (!s) {
+            const columns = await connection.getColumnSchema(schema);
+            s = new ExistingSchema(columns, caseInsensitive);
+            this.cache.set(schema, s);
+        }
+        if (caseInsensitive) {
+            table = table.toLowerCase();
+        }
+        return s.tables.get(table) ?? [];
+    }
+
+    private static cache = new Map<string, ExistingSchema>();
+
+    public tables = new Map<string,IColumnSchema[]>();
+
+    constructor(columns: IColumnSchema[], caseInsensitive = false) {
+        for (const c of columns) {
+            let tableName = c.ownerName;
+            if (caseInsensitive) {
+                tableName = tableName.toLowerCase();
+            }
+            let table = this.tables.get(tableName);
+            if (!table) {
+                table = [];
+                this.tables.set(tableName, table);
+            }
+            table.push(c);
+        }
+    }
+
+}

package/src/migrations/Migrations.ts

@@ -1,37 +1,52 @@
+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";
+import ExistingSchema from "./ExistingSchema.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 +200,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,8 @@ 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 ExistingSchema from "../ExistingSchema.js";
 import PostgresMigrations from "./PostgresMigrations.js";
 
 export default class PostgresAutomaticMigrations extends PostgresMigrations {
@@ -59,7 +59,7 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
             nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
         }
 
-        const columns =  await driver.getColumnSchema(type.schema || "public", type.name);
+        const columns = await ExistingSchema.getSchema(driver, type.schema || "public", type.name, true);
 
         const columnSet = new Set(columns.map((x) => x.name));
 
@@ -83,13 +83,19 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
                 def += " DEFAULT " + iterator.default;
             }
 
-            await driver.executeQuery(def + ";");
+            await this.executeQuery(def + ";");
         }
 
     }
 
     async createTable(driver: BaseConnection, type: EntityType, keys: IColumn[]) {
 
+        const columns = await ExistingSchema.getSchema(driver, type.schema || "public", type.name, true);
+
+        if (columns.length) {
+            return;
+        }
+
         const name = type.schema
             ? type.schema + "." + type.name
             : type.name;
@@ -119,7 +125,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 +148,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 +165,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 +224,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 +251,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,11 @@ 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 ExistingSchema from "../ExistingSchema.js";
 import SqlServerMigrations from "./SqlServerMigrations.js";
 
 export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
@@ -62,7 +62,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
         }
 
-        const columns =  await driver.getColumnSchema(type.schema || "dbo", type.name);
+        const columns =  await ExistingSchema.getSchema(driver, type.schema || "dbo", type.name);
 
         const columnSet = new Set(columns.map((x) => x.name.toLowerCase()));
 
@@ -75,7 +75,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,13 +91,19 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             if (typeof iterator.default === "string") {
                 def += " DEFAULT " + iterator.default;
             }
-            await driver.executeQuery(def + ";");
+            await this.executeQuery(def + ";");
         }
 
     }
 
     async createTable(driver: BaseConnection, type: EntityType, keys: IColumn[]) {
 
+        const columns = await ExistingSchema.getSchema(driver, type.schema || "public", type.name);
+
+        if (columns.length) {
+            return;
+        }
+
         const name = type.schema
             ? type.schema + "." + type.name
             : type.name;
@@ -123,7 +129,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 +155,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 +170,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 +221,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 +244,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" });
     }
 
 }