@entity-access/entity-access 1.0.489 → 1.0.491

package/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 {
 
@@ -90,20 +91,21 @@ export default abstract class Migrations {
                 await this.migrateIndexInternal(context, index, type);
             }
 
-            for (const { isInverseRelation , foreignKeyConstraint, relatedTypeClass } of type.relations) {
+            if (createIndexForForeignKeys) {
+                postMigration.push(() =>
+                    this.createIndexForForeignKeys(context, type, type.nonKeys.filter((x) =>
+                        x.fkRelation
+                        && (!x.key || type.keys.indexOf(x) !== 0)
+                        && !x.fkRelation?.doNotCreateIndex))
+                );
+            }
 
-                if (createIndexForForeignKeys) {
-                    postMigration.push(() =>
-                        this.createIndexForForeignKeys(context, type, type.nonKeys.filter((x) =>
-                            x.fkRelation
-                            && (!x.key || type.keys.indexOf(x) !== 0)
-                            && !x.fkRelation?.doNotCreateIndex))
-                    );
-                }
+            for (const { isInverseRelation , foreignKeyConstraint, relatedTypeClass } of type.relations) {
 
                 if (isInverseRelation) {
                     continue;
                 }
+
                 if (!foreignKeyConstraint) {
                     continue;
                 }

package/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;

package/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;