@entity-access/entity-access 1.0.121 → 1.0.123

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

@@ -56,12 +56,22 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         for (const iterator of nonKeyColumns) {
             const columnName = iterator.columnName;
             let def = `IF COL_LENGTH(${ SqlServerLiteral.escapeLiteral(name)}, ${ SqlServerLiteral.escapeLiteral(columnName)}) IS NULL ALTER TABLE ${name} ADD ${columnName} `;
+
+            if (iterator.computed) {
+                def += ` AS ${iterator.computed} ${iterator.stored ? "PERSISTED" : ""}`;
+                await driver.executeQuery(def + ";");
+                continue;
+            }
+
             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;
             }
@@ -84,8 +94,12 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
 
         for (const iterator of keys) {
             let def = iterator.columnName + " ";
-            if (iterator.autoGenerate) {
-                def += `${this.getColumnDefinition(iterator)} NOT NULL IDENTITY(1,1)`;
+            if (iterator.generated) {
+                switch(iterator.generated) {
+                    case "identity":
+                        def += `${this.getColumnDefinition(iterator)} NOT NULL IDENTITY(1,1)`;
+                        break;
+                }
             } else {
                 def += `${this.getColumnDefinition(iterator)} NOT NULL`;
             }

package/src/model/changes/ChangeEntry.ts

@@ -81,7 +81,7 @@ export default class ChangeEntry<T = any> implements IChanges {
             let keysSet = true;
             let autoGenerate = false;
             for (const iterator of keys) {
-                autoGenerate ||= iterator.autoGenerate;
+                autoGenerate ||= iterator.generated as unknown as boolean;
                 if(entity[iterator.name] === void 0) {
                     keysSet = false;
                 }

package/src/query/ast/ExpressionToSql.ts

@@ -444,7 +444,7 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
         if (e.fields.length === 0) {
             return [];
         }
-        const fields = this.visitArray(e.fields).join(",");
+        const fields = this.visitArray(e.fields);
         return prepare ` RETURNING ${fields}`;
     }
 

package/src/tests/model/ShoppingContext.ts

@@ -5,6 +5,7 @@ import Table from "../../decorators/Table.js";
 import Index from "../../decorators/Index.js";
 import DateTime from "../../types/DateTime.js";
 import { UserFile } from "./UseFile.js";
+import Sql from "../../sql/Sql.js";
 
 export const statusPublished = "published";
 
@@ -41,7 +42,7 @@ export class ShoppingContext extends EntityContext {
 })
 export class User {
 
-    @Column({ key: true , autoGenerate: true, dataType: "BigInt" })
+    @Column({ key: true , generated: "identity", dataType: "BigInt" })
     public userID: number;
 
     @Column({})
@@ -80,6 +81,10 @@ export class Category {
     @Column({ length: 200 })
     public name: string;
 
+
+    @Column({ computed: (x) => Sql.text.lower(x.name)})
+    public lowerName: string;
+
     @Column({ dataType: "Char", length: 200, nullable: true })
     @RelateTo(Category, {
         property: (c) => c.parent,
@@ -118,7 +123,7 @@ export class UserProfile {
 @Table("ProfilePhotos")
 export class ProfilePhoto {
 
-    @Column({ key: true, dataType: "BigInt", autoGenerate: true })
+    @Column({ key: true, dataType: "BigInt", generated: "identity" })
     public photoID: number;
 
     @Column ({ dataType: "BigInt"})
@@ -162,7 +167,7 @@ export class UserCategory {
 @Table("Products")
 export class Product {
 
-    @Column({ key: true, autoGenerate: true, dataType: "BigInt" })
+    @Column({ key: true, generated: "identity", dataType: "BigInt" })
     public productID: number;
 
     @Column()
@@ -189,7 +194,7 @@ export class Product {
 @Table("ProductCategories")
 export class ProductCategory {
 
-    @Column({ key: true, dataType: "BigInt", autoGenerate: true })
+    @Column({ key: true, dataType: "BigInt", generated: "identity" })
     public productCategoryID: number;
 
     @Column({ dataType: "BigInt" })
@@ -214,7 +219,7 @@ export class ProductCategory {
 @Table("ProductPrices")
 export class ProductPrice {
 
-    @Column({ key: true, autoGenerate: true, dataType: "BigInt"})
+    @Column({ key: true, generated: "identity", dataType: "BigInt"})
     public priceID: number;
 
     @Column()
@@ -248,7 +253,7 @@ export class ProductPrice {
 })
 export class Order {
 
-    @Column({ key: true, autoGenerate: true, dataType: "BigInt"})
+    @Column({ key: true, generated: "identity", dataType: "BigInt"})
     public orderID: number;
 
     @Column()
@@ -273,7 +278,7 @@ export class Order {
 @Table("OrderItems")
 export class OrderItem {
 
-    @Column({ key: true, autoGenerate: true, dataType: "BigInt"})
+    @Column({ key: true, generated: "identity", dataType: "BigInt"})
     public orderItemID: number;
 
     @Column()

package/src/tests/model/UseFile.ts

@@ -6,7 +6,7 @@ import { User } from "./ShoppingContext.js";
 @Table("UserFiles")
 export class UserFile {
 
-    @Column({ dataType: "BigInt", key: true, autoGenerate: true })
+    @Column({ dataType: "BigInt", key: true, generated: "identity" })
     public fileID: number;
 
     @Column({ dataType: "BigInt"})