@entity-access/entity-access 1.0.288 → 1.0.290

package/src/migrations/postgres/PostgresAutomaticMigrations.ts

@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+import ICheckConstraint from "../../decorators/ICheckConstraint.js";
 import { IColumn } from "../../decorators/IColumn.js";
 import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
 import { IIndex } from "../../decorators/IIndex.js";
@@ -131,31 +132,41 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
         await driver.executeQuery(query);
     }
 
-    async migrateForeignKey(context: EntityContext, constraint: IForeignKeyConstraint) {
-        const { type } = constraint;
-        const name = type.schema
-        ? type.schema + "." + type.name
-        : type.name;
+    async constraintExists(context: EntityContext, name: string, schema: string) {
 
         let text = `SELECT * FROM information_schema.referential_constraints
         WHERE lower(constraint_name)=lower($1)
         `;
 
-        const values = [constraint.name];
+        const values = [name];
 
-        if(type.schema) {
+        if(schema) {
             text += " and constraint_schema = $2";
-            values.push(type.schema);
+            values.push(schema);
         }
 
         const driver = context.connection;
 
         const r = await driver.executeQuery({ text, values });
         if (r.rows?.length) {
+            return true;
+        }
+        return false;
+    }
+
+    async migrateForeignKey(context: EntityContext, constraint: IForeignKeyConstraint) {
+        const { type } = constraint;
+        const name = type.schema
+        ? type.schema + "." + type.name
+        : type.name;
+
+        if (await this.constraintExists(context, constraint.name, type.schema)) {
             return;
         }
 
-        text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} 
+        const driver = context.connection;
+
+        let text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} 
             foreign key (${constraint.column.columnName})
             references ${constraint.refColumns[0].entityType.name}(
                 ${constraint.refColumns.map((x) => x.columnName).join(",")}
@@ -186,5 +197,28 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
 
     }
 
+    async migrateCheckConstraint(context: EntityContext, constraint: ICheckConstraint<any>, type: EntityType) {
+        if (await this.constraintExists(context, constraint.name, type.schema)) {
+            return;
+        }
+
+        const name = type.schema
+        ? type.schema + "." + type.name
+        : type.name;
+
+
+        const driver = context.connection;
+
+        const text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} CHECK (${constraint.filter})`;
+
+        try {
+            await driver.executeQuery(text);
+        } catch (error) {
+            // we will simply ignore this
+            console.warn(`Failed adding constraint ${constraint.name}`);
+            console.warn(error);
+        }
+    }
+
 
 }

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

@@ -1,3 +1,4 @@
+import ICheckConstraint from "../../decorators/ICheckConstraint.js";
 import { IColumn } from "../../decorators/IColumn.js";
 import { IForeignKeyConstraint } from "../../decorators/IForeignKeyConstraint.js";
 import { IIndex } from "../../decorators/IIndex.js";
@@ -137,30 +138,40 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         await driver.executeQuery(query);
     }
 
-    async migrateForeignKey(context: EntityContext, constraint: IForeignKeyConstraint) {
-        const { type } = constraint;
-        const name = type.schema
-        ? type.schema + "." + type.name
-        : type.name;
-
-        let text = `SELECT COUNT(*) 
+    async constraintExists(context: EntityContext, name: string, schema: string, type: EntityType) {
+        let text = `SELECT COUNT(*) as c1
         FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS 
         WHERE TABLE_NAME='${type.name}' 
-        AND CONSTRAINT_NAME='${constraint.name}' 
-        AND CONSTRAINT_TYPE='FOREIGN KEY'`;
+        AND CONSTRAINT_NAME='${name}'`;
 
-        if(type.schema) {
-            text += ` and schema_name = ${type.schema}`;
+        if(schema) {
+            text += ` and schema_name = ${schema}`;
         }
 
         const driver = context.connection;
 
         const r = await driver.executeQuery(text);
-        if (r.rows?.length) {
+        if (r.rows?.length === 0) {
+            if (r.rows["c1"] > 0) {
+                return true;
+            }
+        }
+
+    }
+
+    async migrateForeignKey(context: EntityContext, constraint: IForeignKeyConstraint) {
+        const { type } = constraint;
+        const name = type.schema
+        ? type.schema + "." + type.name
+        : type.name;
+
+        if (await this.constraintExists(context, name, type.schema, type)) {
             return;
         }
 
-        text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} 
+        const driver = context.connection;
+
+        let text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} 
             foreign key (${constraint.column.columnName})
             references ${constraint.refColumns[0].entityType.name}(
                 ${constraint.refColumns.map((x) => x.columnName).join(",")}
@@ -190,4 +201,27 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         }
     }
 
+    async migrateCheckConstraint(context: EntityContext, constraint: ICheckConstraint<any>, type: EntityType) {
+        if (await this.constraintExists(context, constraint.name, type.schema, type)) {
+            return;
+        }
+
+        const name = type.schema
+        ? type.schema + "." + type.name
+        : type.name;
+
+
+        const driver = context.connection;
+
+        const text = `ALTER TABLE ${name} ADD CONSTRAINT ${constraint.name} CHECK (${constraint.filter})`;
+
+        try {
+            await driver.executeQuery(text);
+        } catch (error) {
+            // we will simply ignore this
+            console.warn(`Failed adding constraint ${constraint.name}`);
+            console.warn(error);
+        }
+    }
+
 }

package/src/model/EntityModel.ts

@@ -27,6 +27,7 @@ const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>, naming
         t.addColumn(column);
     }
     t.indexes.push(... original.indexes.map((i) => ({ ... i, columns: [ ... i.columns.map((c) => ( { ... c}))] })));
+    t.checkConstraints.push(... original.checkConstraints.map((i) => ({ ... i})));
     // sort keys...
     if (t.keys.length > 1) {
         t.keys.sort((a, b) => a.order - b.order);

package/src/model/EntitySource.ts

@@ -155,7 +155,7 @@ export class EntitySource<T = any> {
             }
             return returnEntity;
         } catch (error) {
-            if (retry) {
+            if (retry > 0) {
                 await sleep(300);
                 return await this.saveDirect({ keys, mode, changes, updateAfterSelect } as any, retry -1);
             }

package/src/tests/db-tests/tests/check-constraint-test.ts

@@ -0,0 +1,35 @@
+import assert from "assert";
+import { Sql } from "../../../index.js";
+import { TestConfig } from "../../TestConfig.js";
+import { createContext } from "../../model/createContext.js";
+
+export default async function(this: TestConfig) {
+
+    if (!this.db) {
+        return;
+    }
+
+    const context = await createContext(this.driver);
+
+    const first = await context.products.all().first();
+
+    first.name = "First product";
+
+    try {
+
+        // try direct save...
+        await context.productPrices.saveDirect({
+            mode: "insert",
+            changes: {
+                productID: first.productID,
+                active: true,
+                amount: -1,
+                startDate: new Date(),
+            }
+        });
+    } catch (error) {
+        // expcted...
+        return;
+    }
+    assert.fail();
+}

package/src/tests/model/ShoppingContext.ts

@@ -7,6 +7,7 @@ import DateTime from "../../types/DateTime.js";
 import { UserFile } from "./UseFile.js";
 import Sql from "../../sql/Sql.js";
 import MultiForeignKeys from "../../decorators/ForeignKey.js";
+import CheckConstraint from "../../decorators/CheckConstraint.js";
 
 export const statusPublished = "published";
 
@@ -285,6 +286,10 @@ export class ProductCategory {
 }
 
 @Table("ProductPrices")
+@CheckConstraint({
+    name: "CX_ProductPrices_PositivePrice",
+    filter: (x) => x.amount > 0
+})
 export class ProductPrice {
 
     @Column({ key: true, generated: "identity", dataType: "BigInt"})