@entity-access/entity-access 1.0.166 → 1.0.167

package/src/query/ast/Expressions.ts

@@ -398,6 +398,7 @@ export class UpsertStatement extends Expression {
     insert: BinaryExpression[];
     update: BinaryExpression[];
     keys: BinaryExpression[];
+    returnUpdated: ReturnUpdated;
 }
 
 export class UnionAllStatement extends Expression {

package/src/tests/db-tests/tests/upsert-test.ts

@@ -0,0 +1,18 @@
+import assert from "assert";
+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);
+
+    let e = await context.emailAddresses.saveDirect({ address: "e@e.com"}, "upsert", { address: "e@e.com"});
+    assert.strictEqual("1", e.id);
+    e = await context.emailAddresses.saveDirect({ address: "e@e.com"}, "upsert", { address: "e@e.com"});
+    assert.strictEqual("1", e.id);
+    await context.saveChanges();
+}

package/src/tests/model/ShoppingContext.ts

@@ -32,6 +32,8 @@ export class ShoppingContext extends EntityContext {
     public profilePhotos = this.model.register(ProfilePhoto);
 
     public userFiles = this.model.register(UserFile);
+
+    public emailAddresses = this.model.register(EmailAddress);
 }
 
 @Table("Users")
@@ -72,6 +74,22 @@ export class User {
     public photo: UserFile;
 }
 
+@Table("EmailAddresses")
+@Index({
+    name: "IX_Unique_EmailAddress",
+    columns: [{ name: (x) => x.address , descending: false }],
+    unique: true
+})
+export class EmailAddress {
+
+    @Column({ key: true, generated: "identity"})
+    public id: number;
+
+    @Column({ dataType: "Char", length: 200 })
+    public address: string;
+
+}
+
 @Table("Categories")
 export class Category {