migration steps reduced

Author: ackava

src/common/IColumnSchema.ts

@@ -6,4 +6,6 @@ export default interface IColumnSchema {
     default: string;
     key: boolean;
     computed?: any;
+    ownerName?: string;
+    ownerType?: string;
 }

src/drivers/base/BaseDriver.ts

@@ -210,7 +210,7 @@ export abstract class BaseConnection {
         return tx;
     }
 
-    abstract getColumnSchema(schema: string, table: string): Promise<IColumnSchema[]>;
+    abstract getColumnSchema(schema: string): Promise<IColumnSchema[]>;
 
 
     protected abstract createDbTransaction(): Promise<EntityTransaction>;

src/drivers/postgres/PostgreSqlDriver.ts

@@ -220,7 +220,7 @@ class PostgreSqlConnection extends BaseConnection {
         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",
@@ -243,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;
     }
 

src/drivers/sql-server/SqlServerDriver.ts

@@ -129,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],
@@ -161,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;
     }
 

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);
+        }
+    }
+
+}

src/migrations/Migrations.ts

@@ -9,6 +9,7 @@ import type { BaseConnection, IQuery, IQueryResult } from "../drivers/base/BaseD
 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 {
 

src/migrations/postgres/PostgresAutomaticMigrations.ts

@@ -6,6 +6,7 @@ import { IIndex } from "../../decorators/IIndex.js";
 import { BaseConnection, BaseDriver } from "../../drivers/base/BaseDriver.js";
 import EntityType from "../../entity-query/EntityType.js";
 import type EntityContext from "../../model/EntityContext.js";
+import ExistingSchema from "../ExistingSchema.js";
 import PostgresMigrations from "./PostgresMigrations.js";
 
 export default class PostgresAutomaticMigrations extends PostgresMigrations {
@@ -58,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));
 
@@ -89,6 +90,12 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
 
     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;

src/migrations/sql-server/SqlServerAutomaticMigrations.ts

@@ -7,6 +7,7 @@ import { BaseConnection } from "../../drivers/base/BaseDriver.js";
 import { SqlServerLiteral } from "../../drivers/sql-server/SqlServerLiteral.js";
 import EntityType from "../../entity-query/EntityType.js";
 import type EntityContext from "../../model/EntityContext.js";
+import ExistingSchema from "../ExistingSchema.js";
 import SqlServerMigrations from "./SqlServerMigrations.js";
 
 export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
@@ -61,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()));
 
@@ -97,6 +98,12 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
 
     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;