@entity-access/entity-access 1.0.490 → 1.0.492

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

@@ -4,10 +4,10 @@ import { IColumn } from "../../decorators/IColumn.js";
 import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
 import { IIndex } from "../../decorators/IIndex.js";
 import { BaseConnection } from "../../drivers/base/BaseDriver.js";
+import ExistingSchema from "../../drivers/base/ExistingSchema.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 {
@@ -23,20 +23,6 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         END`);
     }
 
-    async migrateTable(context: EntityContext, type: EntityType) {
-
-
-        // create table if not exists...
-        const nonKeyColumns = type.nonKeys;
-        const keys = type.keys;
-
-        const driver = context.connection;
-
-        await this.createTable(driver, type, keys);
-
-        await this.createColumns(driver, type, nonKeyColumns);
-
-    }
 
     async createIndexForForeignKeys(context: EntityContext, type: EntityType, fkColumns: IColumn[]) {
         for (const iterator of fkColumns) {
@@ -48,61 +34,43 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
                 columns: [{ name: iterator.quotedColumnName, descending: iterator.indexOrder !== "ascending"}],
                 filter
             };
-            await this.migrateIndex(context, indexDef, type);
+            await this.migrateIndexInternal(context, indexDef, type);
         }
     }
 
-    async createColumns(driver: BaseConnection, type: EntityType, nonKeyColumns: IColumn[]) {
+    async createColumn(type: EntityType, iterator: IColumn) {
 
-        const name = type.schema
-        ? type.schema + "." + type.name
-        : type.name;
-
-        if (nonKeyColumns.length > 1) {
-            nonKeyColumns.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
-        }
+        const { quotedColumnName } = iterator;
 
-        const columns =  await ExistingSchema.getSchema(driver, type.schema || "dbo", type.name);
-
-        const columnSet = new Set(columns.map((x) => x.name.toLowerCase()));
-
-        for (const iterator of nonKeyColumns) {
-            const { quotedColumnName, columnName } = iterator;
-            if (columnSet.has(columnName.toLowerCase())) {
-                continue;
-            }
-            let def = `ALTER TABLE ${name} ADD ${quotedColumnName} `;
+        const name = type.schema
+            ? type.schema + "." + type.name
+            : type.name;
 
-            if (iterator.computed) {
-                def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
-                await this.executeQuery(def + ";");
-                continue;
-            }
+        let def = `ALTER TABLE ${name} ADD ${quotedColumnName} `;
 
-            def += this.getColumnDefinition(iterator);
-            if (iterator.nullable === true) {
-                def += " NULL ";
-            } else {
-                def += " NOT NULL ";
-            }
-            if (iterator.computed) {
-                def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
-            }
-            if (typeof iterator.default === "string") {
-                def += " DEFAULT " + iterator.default;
-            }
+        if (iterator.computed) {
+            def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
             await this.executeQuery(def + ";");
+            return;
         }
 
-    }
-
-    async createTable(driver: BaseConnection, type: EntityType, keys: IColumn[]) {
+        def += this.getColumnDefinition(iterator);
+        if (iterator.nullable === true) {
+            def += " NULL ";
+        } else {
+            def += " NOT NULL ";
+        }
+        if (iterator.computed) {
+            def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
+        }
+        if (typeof iterator.default === "string") {
+            def += " DEFAULT " + iterator.default;
+        }
+        await this.executeQuery(def + ";");
 
-        const columns = await ExistingSchema.getSchema(driver, type.schema || "public", type.name);
+    }
 
-        if (columns.length) {
-            return;
-        }
+    async createTable(type: EntityType, keys: IColumn[]) {
 
         const name = type.schema
             ? type.schema + "." + type.name
@@ -138,6 +106,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
     }
 
     async migrateIndex(context: EntityContext, index: IIndex, type: EntityType) {
+
         const driver = context.connection;
         const name = type.schema
             ? type.schema + "." + type.name

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

@@ -1,8 +1,94 @@
+import CIMap from "../../common/CIMap.js";
 import { IColumn } from "../../decorators/IColumn.js";
+import ExistingSchema from "../../drivers/base/ExistingSchema.js";
+import EntityType from "../../entity-query/EntityType.js";
 import Migrations from "../Migrations.js";
 
 export default abstract class SqlServerMigrations extends Migrations {
 
+    protected schemaCache = new CIMap<ExistingSchema>();
+
+    async getExistingSchema(type: EntityType) {
+
+        const schema = type.schema || "dbo";
+
+        let text = `
+                        SELECT
+                COLUMN_NAME as [name],
+                CASE DATA_TYPE
+                    WHEN 'bit' THEN 'Boolean'
+                    WHEN 'int' Then 'Int'
+                    WHEN 'bigint' THEN 'BigInt'
+                    WHEN 'date' then 'DateTime'
+                    WHEN 'datetime' then 'DateTime'
+                    WHEN 'datetime2' then 'DateTime'
+                    WHEN 'real' then 'Float'
+                    WHEN 'double' then 'Double'
+                    WHEN 'decimal' then 'Decimal'
+                    WHEN 'identity' then 'UUID'
+                    WHEN 'varbinary' then 'ByteArray'
+                    WHEN 'geometry' then 'Geometry'
+                    ELSE 'Char'
+                END as [dataType],
+                CASE WHEN IS_NULLABLE = 'YES' THEN 1 ELSE 0 END as [nullable],
+                CHARACTER_MAXIMUM_LENGTH as [length],
+                CASE 
+                    WHEN COLUMN_DEFAULT = 'getutcdate()' then '() => Sql.date.now()'
+                    WHEN COLUMN_DEFAULT = '(getutcdate())' then '() => Sql.date.now()'
+                    WHEN COLUMN_DEFAULT = '(newid())' then '() => Sql.crypto.randomUUID()'
+                    WHEN (COLUMN_DEFAULT = '(0)' OR COLUMN_DEFAULT = '((0))')
+                        AND DATA_TYPE = 'bit' THEN '() => false'
+                    WHEN (COLUMN_DEFAULT = '(1)' OR COLUMN_DEFAULT = '((1))')
+                        AND DATA_TYPE = 'bit' THEN '() => true'
+                    WHEN COLUMN_DEFAULT is NULL THEN ''
+                    ELSE '() => ' + COLUMN_DEFAULT
+                END as [default],
+                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
+        `;
+        let r = await this.executeQuery({ text, values: [schema] });
+        const columns = r.rows ?? [];
+
+        text = `
+            SELECT 
+                ind.name as [name]
+            FROM 
+                sys.indexes ind 
+            INNER JOIN 
+                sys.tables t ON ind.object_id = t.object_id
+            INNER JOIN
+                sys.schemas s ON t.schema_id = s.schema_id
+            WHERE
+                s.name = $1`;
+        r = await this.executeQuery({ text, values: [schema] });
+        const indexes = r.rows ?? [];
+
+        text = `
+            SELECT 
+                CONSTRAINT_NAME as [name]
+            FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
+            WHERE
+                CONSTRAINT_TYPE <> 'Foreign Key'
+                AND TABLE_SCHEMA=$1`;
+        r = await this.executeQuery({ text, values: [schema] });
+        const constraints = r.rows ?? [];
+
+        text = `
+            SELECT 
+                CONSTRAINT_NAME as [name]
+            FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
+            WHERE
+                CONSTRAINT_TYPE = 'Foreign Key'
+                AND TABLE_SCHEMA=$1`;
+        r = await this.executeQuery({ text, values: [schema] });
+        const foreignKeys = r.rows ?? [];
+
+        return new ExistingSchema(true, { columns, indexes, constraints, foreignKeys });
+    }
+
     protected getColumnDefinition(iterator: IColumn) {
         if (iterator.dataType === "Decimal") {
             if (iterator.precision && iterator.scale) {

package/dist/migrations/ExistingSchema.d.ts

@@ -1,9 +0,0 @@
-import IColumnSchema from "../common/IColumnSchema.js";
-import type { BaseConnection } from "../drivers/base/BaseDriver.js";
-export default class ExistingSchema {
-    static getSchema(connection: BaseConnection, schema: string, table: string, caseInsensitive?: boolean): Promise<IColumnSchema[]>;
-    private static cache;
-    tables: Map<string, IColumnSchema[]>;
-    constructor(columns: IColumnSchema[], caseInsensitive?: boolean);
-}
-//# sourceMappingURL=ExistingSchema.d.ts.map

package/dist/migrations/ExistingSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExistingSchema.d.ts","sourceRoot":"","sources":["../../src/migrations/ExistingSchema.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,CAAC,OAAO,OAAO,cAAc;WAGX,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,UAAQ;IAahH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAqC;IAElD,MAAM,+BAAqC;gBAEtC,OAAO,EAAE,aAAa,EAAE,EAAE,eAAe,UAAQ;CAehE"}

package/dist/migrations/ExistingSchema.js

@@ -1,31 +0,0 @@
-export default class ExistingSchema {
-    static async getSchema(connection, schema, table, 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) ?? [];
-    }
-    static cache = new Map();
-    tables = new Map();
-    constructor(columns, 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);
-        }
-    }
-}
-//# sourceMappingURL=ExistingSchema.js.map

package/dist/migrations/ExistingSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExistingSchema.js","sourceRoot":"","sources":["../../src/migrations/ExistingSchema.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,OAAO,cAAc;IAGxB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAA0B,EAAE,MAAc,EAAE,KAAa,EAAE,eAAe,GAAG,KAAK;QAC5G,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,EAAE,CAAC;YACL,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YACzD,CAAC,GAAG,IAAI,cAAc,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YAClB,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAChC,CAAC;QACD,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAEO,MAAM,CAAC,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;IAElD,MAAM,GAAG,IAAI,GAAG,EAA0B,CAAC;IAElD,YAAY,OAAwB,EAAE,eAAe,GAAG,KAAK;QACzD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACtB,IAAI,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;YAC5B,IAAI,eAAe,EAAE,CAAC;gBAClB,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,CAAC;YACD,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,KAAK,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACtC,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACL,CAAC"}

package/src/migrations/ExistingSchema.ts

@@ -1,39 +0,0 @@
-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);
-        }
-    }
-
-}