@entity-access/entity-access 1.0.166 → 1.0.168

package/src/query/ast/ExpressionToSql.ts

@@ -498,6 +498,7 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
         const updateSet = [];
 
         const compare = [];
+        const compareKeys = [];
 
         for (const { left, right } of e.insert) {
             const c = this.visit(left);
@@ -514,15 +515,47 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
 
         for (const { left, right } of e.keys) {
             const c = this.visit(left);
-            compare.push(c);
+            const v = this.visit(right);
+            compare.push(prepare `${c}=${v}`);
+            compareKeys.push(c);
         }
 
+        const returnValues = e.returnUpdated ? this.visit(e.returnUpdated) : [];
+
+        if (!updateSet.length) {
+
+            if (e.returnUpdated) {
+
+                const keys = e.returnUpdated.fields.map((x) => this.visit(x));
+
+                return prepare `WITH x AS(
+                    INSERT INTO ${table} (${prepareJoin(insertColumns)})
+                        VALUES (${prepareJoin(insertValues)})
+                        LIMIT COALESCE((SELECT 1 FROM ${table} WHERE ${prepareJoin(compare, " AND ")}),2)-1
+                        ON CONFLICT(${prepareJoin(compareKeys)})
+                        DO NOTHING
+                    ${returnValues}
+                )
+                SELECT * FROM x
+                UNION
+                    SELECT ${prepareJoin(keys)} FROM ${table} WHERE ${prepareJoin(compare, " AND ")}`;
+            }
+
+            return prepare `INSERT INTO ${table} (${prepareJoin(insertColumns)})
+            VALUES (${prepareJoin(insertValues)})
+            LIMIT COALESCE((SELECT 1 FROM ${table} WHERE ${prepareJoin(compare, " AND ")}),2)-1
+            ON CONFLICT(${prepareJoin(compareKeys)})
+            DO NOTHING
+            ${returnValues}`;
+    }
 
         return prepare `INSERT INTO ${table} (${prepareJoin(insertColumns)})
             VALUES (${prepareJoin(insertValues)})
-            ON CONFLICT(${prepareJoin(compare)})
+            LIMIT COALESCE((SELECT 1 FROM ${table} WHERE ${prepareJoin(compare, " AND ")}),2)-1
+            ON CONFLICT(${prepareJoin(compareKeys)})
             DO UPDATE SET
-                ${prepareJoin(updateSet)} `;
+                ${prepareJoin(updateSet)}
+            ${returnValues}`;
     }
 
     visitNewObjectExpression(e: NewObjectExpression): ITextQuery {

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,25 @@
+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);
+
+    e = await context.emailAddresses.saveDirect({ address: "a@e.com"}, "insert-select", { address: "a@e.com"});
+    assert.strictEqual("2", e.id);
+
+    e = await context.emailAddresses.saveDirect({ address: "a@e.com"}, "insert-select", { address: "a@e.com"});
+    assert.strictEqual("2", 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 {