@entity-access/entity-access 1.0.333 → 1.0.336
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/decorators/IColumn.d.ts +2 -0
- package/dist/decorators/IColumn.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.js +18 -18
- package/dist/drivers/base/BaseDriver.js.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js +2 -2
- package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
- package/dist/drivers/sql-server/SqlServerDriver.d.ts.map +1 -1
- package/dist/drivers/sql-server/SqlServerDriver.js +2 -3
- package/dist/drivers/sql-server/SqlServerDriver.js.map +1 -1
- package/dist/entity-query/EntityType.d.ts +1 -1
- package/dist/entity-query/EntityType.d.ts.map +1 -1
- package/dist/entity-query/EntityType.js +4 -2
- package/dist/entity-query/EntityType.js.map +1 -1
- package/dist/model/EntityModel.d.ts.map +1 -1
- package/dist/model/EntityModel.js +8 -4
- package/dist/model/EntityModel.js.map +1 -1
- package/dist/model/EntitySource.d.ts +1 -6
- package/dist/model/EntitySource.d.ts.map +1 -1
- package/dist/model/EntitySource.js +3 -4
- package/dist/model/EntitySource.js.map +1 -1
- package/dist/tests/db-tests/tests/check-constraint-test.d.ts.map +1 -1
- package/dist/tests/db-tests/tests/check-constraint-test.js +5 -8
- package/dist/tests/db-tests/tests/check-constraint-test.js.map +1 -1
- package/dist/tests/db-tests/tests/multi-fk-tests.d.ts.map +1 -1
- package/dist/tests/db-tests/tests/multi-fk-tests.js +11 -20
- package/dist/tests/db-tests/tests/multi-fk-tests.js.map +1 -1
- package/dist/tests/db-tests/tests/upsert-test.d.ts.map +1 -1
- package/dist/tests/db-tests/tests/upsert-test.js +8 -16
- package/dist/tests/db-tests/tests/upsert-test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/workflows/WorkflowStorage.d.ts.map +1 -1
- package/dist/workflows/WorkflowStorage.js +8 -7
- package/dist/workflows/WorkflowStorage.js.map +1 -1
- package/package.json +1 -1
- package/src/decorators/IColumn.ts +3 -0
- package/src/drivers/base/BaseDriver.ts +18 -18
- package/src/drivers/postgres/PostgreSqlDriver.ts +2 -2
- package/src/drivers/sql-server/SqlServerDriver.ts +2 -3
- package/src/entity-query/EntityType.ts +4 -2
- package/src/model/EntityModel.ts +9 -4
- package/src/model/EntitySource.ts +3 -4
- package/src/tests/db-tests/tests/check-constraint-test.ts +5 -8
- package/src/tests/db-tests/tests/multi-fk-tests.ts +11 -20
- package/src/tests/db-tests/tests/upsert-test.ts +13 -14
- package/src/workflows/WorkflowStorage.ts +8 -7
|
@@ -151,8 +151,8 @@ let WorkflowStorage = class WorkflowStorage {
|
|
|
151
151
|
}
|
|
152
152
|
async getWorkflow(id) {
|
|
153
153
|
const db = new WorkflowContext(this.driver);
|
|
154
|
-
const r = await db.workflows.
|
|
155
|
-
if (r
|
|
154
|
+
const r = await db.workflows.statements.select({}, { id, isWorkflow: true });
|
|
155
|
+
if (r) {
|
|
156
156
|
return {
|
|
157
157
|
id,
|
|
158
158
|
parentID: r.parentID,
|
|
@@ -174,8 +174,8 @@ let WorkflowStorage = class WorkflowStorage {
|
|
|
174
174
|
}
|
|
175
175
|
async getAny(id) {
|
|
176
176
|
const db = new WorkflowContext(this.driver);
|
|
177
|
-
const r = await db.workflows.
|
|
178
|
-
if (r
|
|
177
|
+
const r = await db.workflows.statements.select({}, { id });
|
|
178
|
+
if (r) {
|
|
179
179
|
return {
|
|
180
180
|
id,
|
|
181
181
|
parentID: r.parentID,
|
|
@@ -197,8 +197,9 @@ let WorkflowStorage = class WorkflowStorage {
|
|
|
197
197
|
const db = new WorkflowContext(this.driver);
|
|
198
198
|
if (text) {
|
|
199
199
|
// save..
|
|
200
|
-
await db.workflows.
|
|
201
|
-
|
|
200
|
+
await db.workflows.statements.update({ extra: text }, { id });
|
|
201
|
+
// await db.workflows.where({ id }, (p) => (x) => x.id === p.id)
|
|
202
|
+
// .update({ text}, (p) => (x) => ({ extra: p.text }));
|
|
202
203
|
return text;
|
|
203
204
|
}
|
|
204
205
|
const item = await db.workflows.where({ id }, (p) => (x) => x.id === p.id)
|
|
@@ -238,7 +239,7 @@ let WorkflowStorage = class WorkflowStorage {
|
|
|
238
239
|
}
|
|
239
240
|
else {
|
|
240
241
|
// await db.workflows.saveDirect({ mode: "upsert", changes: state });
|
|
241
|
-
await db.workflows.statements.upsert(
|
|
242
|
+
await db.workflows.statements.upsert(state);
|
|
242
243
|
}
|
|
243
244
|
await tx.commit();
|
|
244
245
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkflowStorage.js","sourceRoot":"","sources":["../../src/workflows/WorkflowStorage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"WorkflowStorage.js","sourceRoot":"","sources":["../../src/workflows/WorkflowStorage.ts"],"names":[],"mappings":";AAAA,+BAA+B;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAC3C,OAAO,KAAK,MAAM,wBAAwB,CAAC;AAC3C,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,iBAAiB,EAAmB,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAoB,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC3I,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAwBrC,IAAM,YAAY,GAAlB,MAAM,YAAY;CA+DxB,CAAA;AA5DU;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;wCACnC;AAGX;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;;gDACL;AAGpB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACzB;AAGb;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACjC;AAGlB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAC,CAAC;;2CACP;AAGd;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;4CACtB;AAGf;IADN,MAAM,CAAC,EAAG,CAAC;8BACA,QAAQ;yCAAC;AAGd;IADN,MAAM,CAAC,EAAG,CAAC;8BACG,QAAQ;4CAAC;AAGjB;IADN,MAAM,CAAC,EAAG,CAAC;8BACI,QAAQ;6CAAC;AAMlB;IAJN,MAAM,CAAC;QACJ,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;QAC5B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;KAC3B,CAAC;;+CACuB;AAKlB;IAHN,MAAM,CAAC;QACJ,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI;KAChD,CAAC;;mDAC2B;AAGtB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAC,CAAC;;8CACrB;AAGjB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACT,QAAQ;+CAAC;AAGpB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACF;AAGlB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAC,CAAC;;2CACF;AAGpC;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;2CACvB;AAGd;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;2CACvB;AAGd;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAG,QAAQ,EAAE,IAAI,EAAC,CAAC;;8CAClC;AAGjB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAG,QAAQ,EAAE,IAAI,EAAC,CAAC;;4CACpC;AA9Db,YAAY;IAtBxB,KAAK,CAAC,WAAW,CAAC;IAClB,KAAK,CAAC;QACH,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAC1D,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI;KACtC,CAAC;IACD,KAAK,CAAC;QACH,IAAI,EAAE,4BAA4B;QAClC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE;YACzC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE;SAClD;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI;KACvC,CAAC;IACD,KAAK,CAAC;QACH,IAAI,EAAE,6BAA6B;QACnC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,UAAU,EAAE,KAAK,EAAE;YACnD,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE;SAC/C;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,IAAI,CAAC,CAAC,aAAa,KAAK,IAAI;KACnE,CAAC;GACW,YAAY,CA+DxB;;AAGD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,aAAa;IAA3C;;QAEW,cAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAErD,kBAAa,GAAY,KAAK,CAAC;QAE/B,gBAAW,GAAY,KAAK,CAAC;IAEjC,CAAC;CAAA,CAAA;AARK,eAAe;IADpB,cAAc;GACT,eAAe,CAQpB;AAGc,IAAM,eAAe,GAArB,MAAM,eAAe;IAIhC,YAEY,MAAkB,EAEV,KAAoB;QAF5B,WAAM,GAAN,MAAM,CAAY;QAEV,UAAK,GAAL,KAAK,CAAe;IAGxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,QAAiD;QAE9D,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,KAAK;eAClF,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;aACxB,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aACjD,KAAK,EAAE,CAAC;QAEb,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,QAAQ,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;gBAC7B,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,QAAQ,CAAC,GAAG,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU;QACxB,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,EAAE,CAAC;YACJ,OAAO;gBACH,EAAE;gBACF,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,OAAO,EAAE,CAAC,CAAC,SAAS;gBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,CAAC,YAAY,CAAC,EAAE,IAAI;aACvB,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,EAAE,CAAC;YACJ,OAAO;gBACH,EAAE;gBACF,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,OAAO,EAAE,CAAC,CAAC,SAAS;gBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,CAAC,YAAY,CAAC,EAAE,IAAI;aACvB,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,IAAK;QACjB,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,IAAI,EAAE,CAAC;YACP,SAAS;YACT,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9D,gEAAgE;YAChE,2DAA2D;YAC3D,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;aACrE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAC,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC;QAChE,OAAO,IAAI,EAAE,KAAK,CAAC;IAC3B,CAAC;IAEG;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE;QACX,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;aAC7D,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACvD,IAAI,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5E,OAAO;QACX,CAAC;QACD,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE;aACvB,MAAM,CAAC,EAAE,EAAE,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAA4B;;;YACnC,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;YACjC,MAAY,EAAE,kCAAG,MAAM,UAAU,CAAC,iBAAiB,EAAE,OAAA,CAAC;YACtD,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC;YACzB,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,GAAG,CAAC;YAC/B,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC;YAC9B,0BAA0B;YAC1B,IAAG,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrB,qEAAqE;gBACrE,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACJ,qEAAqE;gBACrE,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;;;;;;;;;;;KACrB;IAED,KAAK,CAAC,OAAO,CAAC,SAAiB,EAAE,MAAoB;QACjD,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAE9B,IAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAEjB,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAElD,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACrC,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;YACtE,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;YAEpE,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC;gBAC/B,KAAK,EAAE,IAAI,CAAC,kBAAkB;gBAC9B,GAAG,EAAE;oBACD,UAAU,CAAC,MAAM,CACb,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC,EACrC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CACrC;oBACD,UAAU,CAAC,MAAM,CACb,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,EACnC,cAAc,CAAC,MAAM,CAAC;wBAClB,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,qBAAqB,CAAC;wBACpD,SAAS,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC;gCAC9B,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC;6BAChD,CAAC;4BACF,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;yBACtC;qBACA,CAAC,CACL;iBACJ;gBACD,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CACzC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAC3B,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAC9B,EAAE,UAAU,CAAC,SAAS,CACnB,UAAU,CAAC,KAAK,CACZ,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,EACnC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAC5B,EACD,UAAU,CAAC,WAAW,CAClB,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,EACnC,cAAc,CAAC,MAAM,CAAC;oBAClB,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC;iBAChD,CAAC,CACL,CACJ,CAAC;aACL,CAAC,CAAC;YAEH,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;QAEzB,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,SAAS;aAC3B,KAAK,CAAC,EAAC,GAAG,EAAE,SAAS,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG;eAC9C,CAAE,CAAC,CAAC,SAAS,KAAK,IAAI;mBAClB,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAC1B;eACE,CAAC,CAAC,UAAU,KAAK,IAAI;eACrB,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aAClC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;aAChC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aACpC,KAAK,CAAC,EAAE,CAAC;aACT,UAAU,CAAC,MAAM,CAAC;aAClB,OAAO,EAAE,CAAC;QACf,MAAM,IAAI,GAAmB,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;QAC1B,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC3B,yBAAyB;YACzB,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC;gBACD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAClD,IAAI,CAAC,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;oBAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACxB,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC;CAEJ,CAAA;AAxNoB,eAAe;IADnC,iBAAiB;IAMT,WAAA,MAAM,CAAA;IAEN,WAAA,MAAM,CAAA;qCADS,UAAU;QAEH,aAAa;GARvB,eAAe,CAwNnC;eAxNoB,eAAe"}
|
package/package.json
CHANGED
|
@@ -244,22 +244,22 @@ export abstract class BaseDriver {
|
|
|
244
244
|
if (returning) {
|
|
245
245
|
returning += ",";
|
|
246
246
|
}
|
|
247
|
-
returning += iterator.
|
|
247
|
+
returning += `${iterator.quotedColumnName} as ${iterator.quotedName}`;
|
|
248
248
|
continue;
|
|
249
249
|
}
|
|
250
250
|
if (setParams) {
|
|
251
251
|
setParams += ",\r\n\t\t";
|
|
252
252
|
}
|
|
253
|
-
setParams += `${iterator.
|
|
253
|
+
setParams += `${iterator.quotedColumnName} = $${i++}`;
|
|
254
254
|
values.push(value.newValue);
|
|
255
255
|
}
|
|
256
256
|
if (keys) {
|
|
257
|
-
for (const key of keys) {
|
|
258
|
-
const iterator = type.
|
|
257
|
+
for (const key of Object.keys(keys)) {
|
|
258
|
+
const iterator = type.getField(key);
|
|
259
259
|
if(where) {
|
|
260
260
|
where += "\r\n\t\tAND ";
|
|
261
261
|
}
|
|
262
|
-
where += `${iterator.
|
|
262
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
263
263
|
values.push(keys[iterator.name]);
|
|
264
264
|
}
|
|
265
265
|
} else {
|
|
@@ -267,7 +267,7 @@ export abstract class BaseDriver {
|
|
|
267
267
|
if(where) {
|
|
268
268
|
where += "\r\n\t\tAND ";
|
|
269
269
|
}
|
|
270
|
-
where += `${iterator.
|
|
270
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
271
271
|
values.push(entity[iterator.name]);
|
|
272
272
|
continue;
|
|
273
273
|
}
|
|
@@ -281,16 +281,16 @@ export abstract class BaseDriver {
|
|
|
281
281
|
if (setParams) {
|
|
282
282
|
setParams += ",\r\n\t\t";
|
|
283
283
|
}
|
|
284
|
-
setParams += `${iterator.
|
|
284
|
+
setParams += `${iterator.quotedColumnName} = $${i++}`;
|
|
285
285
|
values.push(value);
|
|
286
286
|
}
|
|
287
287
|
if (keys) {
|
|
288
|
-
for (const key of keys) {
|
|
289
|
-
const iterator = type.
|
|
288
|
+
for (const key of Object.keys(keys)) {
|
|
289
|
+
const iterator = type.getField(key);
|
|
290
290
|
if(where) {
|
|
291
291
|
where += "\r\n\t\tAND ";
|
|
292
292
|
}
|
|
293
|
-
where += `${iterator.
|
|
293
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
294
294
|
values.push(keys[iterator.name]);
|
|
295
295
|
}
|
|
296
296
|
} else {
|
|
@@ -298,7 +298,7 @@ export abstract class BaseDriver {
|
|
|
298
298
|
if(where) {
|
|
299
299
|
where += "\r\n\t\tAND ";
|
|
300
300
|
}
|
|
301
|
-
where += `${iterator.
|
|
301
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
302
302
|
values.push(entity[iterator.name]);
|
|
303
303
|
}
|
|
304
304
|
}
|
|
@@ -315,7 +315,7 @@ export abstract class BaseDriver {
|
|
|
315
315
|
if(where) {
|
|
316
316
|
where += "\r\n\t\tAND ";
|
|
317
317
|
}
|
|
318
|
-
where += `${iterator.
|
|
318
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
319
319
|
values.push(entity[iterator.name]);
|
|
320
320
|
}
|
|
321
321
|
const text = `DELETE FROM ${type.fullyQualifiedTableName}\r\n\tWHERE ${where}`;
|
|
@@ -328,19 +328,19 @@ export abstract class BaseDriver {
|
|
|
328
328
|
const values = [];
|
|
329
329
|
let i = 1;
|
|
330
330
|
const { quote } = this.compiler;
|
|
331
|
-
for (const iterator of type.
|
|
331
|
+
for (const iterator of type.columns) {
|
|
332
332
|
if (columns) {
|
|
333
333
|
columns += ",\r\n\t\t";
|
|
334
334
|
}
|
|
335
|
-
columns += `${iterator.
|
|
335
|
+
columns += `${iterator.quotedColumnName} as ${iterator.quotedName}`;
|
|
336
336
|
}
|
|
337
337
|
if (keys) {
|
|
338
|
-
for (const key of keys) {
|
|
339
|
-
const iterator = type.
|
|
338
|
+
for (const key of Object.keys(keys)) {
|
|
339
|
+
const iterator = type.getField(key);
|
|
340
340
|
if(where) {
|
|
341
341
|
where += "\r\n\t\tAND ";
|
|
342
342
|
}
|
|
343
|
-
where += `${iterator.
|
|
343
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
344
344
|
values.push(keys[iterator.name]);
|
|
345
345
|
}
|
|
346
346
|
} else {
|
|
@@ -348,7 +348,7 @@ export abstract class BaseDriver {
|
|
|
348
348
|
if(where) {
|
|
349
349
|
where += "\r\n\t\tAND ";
|
|
350
350
|
}
|
|
351
|
-
where += `${iterator.
|
|
351
|
+
where += `${iterator.quotedColumnName} = $${i++}`;
|
|
352
352
|
values.push(entity[iterator.name]);
|
|
353
353
|
}
|
|
354
354
|
}
|
|
@@ -124,7 +124,7 @@ export default class PostgreSqlDriver extends BaseDriver {
|
|
|
124
124
|
} else {
|
|
125
125
|
returning = "RETURNING ";
|
|
126
126
|
}
|
|
127
|
-
returning += iterator.
|
|
127
|
+
returning += iterator.quotedColumnName + " as " + iterator.quotedName;
|
|
128
128
|
continue;
|
|
129
129
|
}
|
|
130
130
|
const value = entity[iterator.name];
|
|
@@ -135,7 +135,7 @@ export default class PostgreSqlDriver extends BaseDriver {
|
|
|
135
135
|
fields += ",\r\n\t\t";
|
|
136
136
|
valueParams += ",\r\n\t\t";
|
|
137
137
|
}
|
|
138
|
-
fields += iterator.
|
|
138
|
+
fields += iterator.quotedColumnName;
|
|
139
139
|
valueParams += `$${i++}`;
|
|
140
140
|
values.push(value);
|
|
141
141
|
}
|
|
@@ -40,10 +40,9 @@ export default class SqlServerDriver extends BaseDriver {
|
|
|
40
40
|
} else {
|
|
41
41
|
returning = "OUTPUT ";
|
|
42
42
|
}
|
|
43
|
-
returning += "INSERTED." + iterator.
|
|
43
|
+
returning += "INSERTED." + iterator.quotedColumnName + " as " + iterator.quotedName;
|
|
44
44
|
continue;
|
|
45
45
|
}
|
|
46
|
-
const field = iterator.columnName;
|
|
47
46
|
const value = entity[iterator.name];
|
|
48
47
|
if (value === void 0) {
|
|
49
48
|
continue;
|
|
@@ -53,7 +52,7 @@ export default class SqlServerDriver extends BaseDriver {
|
|
|
53
52
|
fields += ",\r\n\t\t";
|
|
54
53
|
valueParams += ",\r\n\t\t";
|
|
55
54
|
}
|
|
56
|
-
fields +=
|
|
55
|
+
fields += iterator.quotedColumnName;
|
|
57
56
|
valueParams += `$${i++}`;
|
|
58
57
|
}
|
|
59
58
|
const text = `INSERT INTO ${type.fullyQualifiedTableName}(${fields}) ${returning} VALUES (${valueParams})`;
|
|
@@ -59,7 +59,7 @@ export default class EntityType {
|
|
|
59
59
|
private selectAll: SelectStatement;
|
|
60
60
|
private selectOne: SelectStatement;
|
|
61
61
|
|
|
62
|
-
constructor(original?: EntityType, namingConvention?: IStringTransformer) {
|
|
62
|
+
constructor(original?: EntityType, namingConvention?: IStringTransformer, quote?: IStringTransformer) {
|
|
63
63
|
if (!original) {
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
@@ -68,7 +68,9 @@ export default class EntityType {
|
|
|
68
68
|
this.schema = original.schema ? (namingConvention ? namingConvention(original.schema) : original.schema) : original.schema;
|
|
69
69
|
this.entityName = original.entityName;
|
|
70
70
|
this.doNotCreate = original.doNotCreate;
|
|
71
|
-
this.fullyQualifiedTableName =
|
|
71
|
+
this.fullyQualifiedTableName = quote
|
|
72
|
+
? (this.schema ? quote(this.schema) + "." + quote(this.name) : quote(this.name))
|
|
73
|
+
: this.schema ? this.schema + "." + this.name : this.name;
|
|
72
74
|
}
|
|
73
75
|
|
|
74
76
|
[addOrCreateColumnSymbol](name: string): IColumn {
|
package/src/model/EntityModel.ts
CHANGED
|
@@ -6,16 +6,18 @@ import { BaseDriver } from "../drivers/base/BaseDriver.js";
|
|
|
6
6
|
import EntityType from "../entity-query/EntityType.js";
|
|
7
7
|
import { IStringTransformer } from "../query/ast/IStringTransformer.js";
|
|
8
8
|
import { IEntityRelation } from "../decorators/IColumn.js";
|
|
9
|
+
import type QueryCompiler from "../compiler/QueryCompiler.js";
|
|
9
10
|
|
|
10
11
|
const driverModelCache = Symbol("driverModelCache");
|
|
11
12
|
|
|
12
|
-
const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>,
|
|
13
|
+
const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>, compiler: QueryCompiler) => {
|
|
13
14
|
let t = map.get(type);
|
|
14
15
|
if (t) {
|
|
15
16
|
return t;
|
|
16
17
|
}
|
|
17
18
|
const original = SchemaRegistry.model(type);
|
|
18
|
-
|
|
19
|
+
const { namingConvention, quote } = compiler;
|
|
20
|
+
t = new EntityType(original, namingConvention, quote);
|
|
19
21
|
map.set(type, t);
|
|
20
22
|
for (const iterator of original.columns) {
|
|
21
23
|
const column = { ... iterator };
|
|
@@ -24,6 +26,8 @@ const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>, naming
|
|
|
24
26
|
: (namingConvention
|
|
25
27
|
? namingConvention(column.columnName) : column.columnName);
|
|
26
28
|
column.entityType = t;
|
|
29
|
+
column.quotedColumnName = quote(column.columnName);
|
|
30
|
+
column.quotedName = quote(column.name);
|
|
27
31
|
t.addColumn(column);
|
|
28
32
|
}
|
|
29
33
|
t.indexes.push(... original.indexes.map((i) => ({ ... i, columns: [ ... i.columns.map((c) => ( { ... c}))] })));
|
|
@@ -40,7 +44,7 @@ const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>, naming
|
|
|
40
44
|
continue;
|
|
41
45
|
}
|
|
42
46
|
const relation: IEntityRelation = { ... iterator, relatedEntity: void 0,type: t };
|
|
43
|
-
t.addRelation(relation, (tc) => getOrCreateModel(map, tc,
|
|
47
|
+
t.addRelation(relation, (tc) => getOrCreateModel(map, tc, compiler));
|
|
44
48
|
}
|
|
45
49
|
return t;
|
|
46
50
|
};
|
|
@@ -58,10 +62,11 @@ export default class EntityModel {
|
|
|
58
62
|
let source = this.sources.get(type);
|
|
59
63
|
if (!source) {
|
|
60
64
|
const cache = (this.context.driver[driverModelCache] ??= new Map());
|
|
65
|
+
const { compiler } = this.context.driver;
|
|
61
66
|
const entityType = getOrCreateModel(
|
|
62
67
|
cache,
|
|
63
68
|
type,
|
|
64
|
-
|
|
69
|
+
compiler
|
|
65
70
|
);
|
|
66
71
|
this.types.set(type, entityType);
|
|
67
72
|
source = new EntitySource(entityType, this.context);
|
|
@@ -161,8 +161,7 @@ export class EntityStatements<T = any> {
|
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
-
async upsert(
|
|
165
|
-
const { entity, keys, updateAfterSelect, retry = 3} = p;
|
|
164
|
+
async upsert(entity: Partial<T>, updateAfterSelect?: (x:T) => T, keys?: Partial<T>, retry = 3): Promise<T> {
|
|
166
165
|
const tx = this.context.connection.currentTransaction;
|
|
167
166
|
let tid: string;
|
|
168
167
|
if (tx) {
|
|
@@ -188,13 +187,13 @@ export class EntityStatements<T = any> {
|
|
|
188
187
|
}
|
|
189
188
|
return await this.insert(entity);
|
|
190
189
|
} catch (error) {
|
|
191
|
-
|
|
190
|
+
retry --;
|
|
192
191
|
if(retry > 0) {
|
|
193
192
|
if (tid) {
|
|
194
193
|
await tx.rollbackTo(tid);
|
|
195
194
|
}
|
|
196
195
|
await sleep(300);
|
|
197
|
-
return await this.upsert(
|
|
196
|
+
return await this.upsert(entity, updateAfterSelect, keys, retry);
|
|
198
197
|
}
|
|
199
198
|
throw error;
|
|
200
199
|
}
|
|
@@ -18,14 +18,11 @@ export default async function(this: TestConfig) {
|
|
|
18
18
|
try {
|
|
19
19
|
|
|
20
20
|
// try direct save...
|
|
21
|
-
await context.productPrices.
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
amount: -1,
|
|
27
|
-
startDate: new Date(),
|
|
28
|
-
}
|
|
21
|
+
await context.productPrices.statements.insert({
|
|
22
|
+
productID: first.productID,
|
|
23
|
+
active: true,
|
|
24
|
+
amount: -1,
|
|
25
|
+
startDate: new Date(),
|
|
29
26
|
});
|
|
30
27
|
} catch (error) {
|
|
31
28
|
// expcted...
|
|
@@ -13,29 +13,20 @@ export default async function(this: TestConfig) {
|
|
|
13
13
|
const { userID } = await context.users.asQuery().first();
|
|
14
14
|
const { categoryID } = await context.categories.asQuery().first();
|
|
15
15
|
|
|
16
|
-
await context.userCategories.
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
userID,
|
|
20
|
-
categoryID
|
|
21
|
-
}
|
|
16
|
+
await context.userCategories.statements.insert({
|
|
17
|
+
userID,
|
|
18
|
+
categoryID
|
|
22
19
|
});
|
|
23
20
|
|
|
24
|
-
await context.userCategoryTags.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
userID,
|
|
29
|
-
tag: "A"
|
|
30
|
-
}
|
|
21
|
+
await context.userCategoryTags.statements.insert({
|
|
22
|
+
categoryID,
|
|
23
|
+
userID,
|
|
24
|
+
tag: "A"
|
|
31
25
|
});
|
|
32
|
-
await context.userCategoryTags.
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
userID,
|
|
37
|
-
tag: "B"
|
|
38
|
-
}
|
|
26
|
+
await context.userCategoryTags.statements.insert({
|
|
27
|
+
categoryID,
|
|
28
|
+
userID,
|
|
29
|
+
tag: "B"
|
|
39
30
|
});
|
|
40
31
|
|
|
41
32
|
const first = await context.userCategories.asQuery()
|
|
@@ -13,36 +13,35 @@ export default async function(this: TestConfig) {
|
|
|
13
13
|
let changes = { address: "e@e.com"};
|
|
14
14
|
let keys = { ... changes };
|
|
15
15
|
|
|
16
|
-
let e = await context.emailAddresses.
|
|
16
|
+
let e = await context.emailAddresses.statements.upsert(changes, void 0, keys);
|
|
17
17
|
assert.strictEqual("1", e.id);
|
|
18
|
-
e = await context.emailAddresses.
|
|
18
|
+
e = await context.emailAddresses.statements.upsert(changes, void 0, keys);
|
|
19
19
|
assert.strictEqual("1", e.id);
|
|
20
20
|
|
|
21
|
-
e = await context.emailAddresses.
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
e = await context.emailAddresses.statements.upsert(
|
|
22
|
+
{ ... changes, name: "a" },
|
|
23
|
+
void 0,
|
|
24
|
+
{
|
|
25
25
|
id: e.id
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
);
|
|
28
28
|
assert.strictEqual("1", e.id);
|
|
29
29
|
|
|
30
|
-
e = await context.emailAddresses.
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
keys: {
|
|
30
|
+
e = await context.emailAddresses.statements.selectOrInsert(
|
|
31
|
+
{ ... changes },
|
|
32
|
+
{
|
|
34
33
|
id: e.id
|
|
35
34
|
}
|
|
36
|
-
|
|
35
|
+
);
|
|
37
36
|
assert.strictEqual("1", e.id);
|
|
38
37
|
assert.strictEqual("a", e.name);
|
|
39
38
|
|
|
40
39
|
changes = { address: "a@e.com"};
|
|
41
40
|
keys = { ... changes };
|
|
42
|
-
e = await context.emailAddresses.
|
|
41
|
+
e = await context.emailAddresses.statements.selectOrInsert(changes, keys);
|
|
43
42
|
assert.strictEqual("2", e.id);
|
|
44
43
|
|
|
45
|
-
e = await context.emailAddresses.
|
|
44
|
+
e = await context.emailAddresses.statements.selectOrInsert(changes, keys);
|
|
46
45
|
assert.strictEqual("2", e.id);
|
|
47
46
|
|
|
48
47
|
await context.saveChanges();
|
|
@@ -145,8 +145,8 @@ export default class WorkflowStorage {
|
|
|
145
145
|
|
|
146
146
|
async getWorkflow(id: string) {
|
|
147
147
|
const db = new WorkflowContext(this.driver);
|
|
148
|
-
const r = await db.workflows.
|
|
149
|
-
if (r
|
|
148
|
+
const r = await db.workflows.statements.select({}, { id, isWorkflow: true });
|
|
149
|
+
if (r) {
|
|
150
150
|
return {
|
|
151
151
|
id,
|
|
152
152
|
parentID: r.parentID,
|
|
@@ -170,8 +170,8 @@ export default class WorkflowStorage {
|
|
|
170
170
|
|
|
171
171
|
async getAny(id: string) {
|
|
172
172
|
const db = new WorkflowContext(this.driver);
|
|
173
|
-
const r = await db.workflows.
|
|
174
|
-
if (r
|
|
173
|
+
const r = await db.workflows.statements.select({}, { id });
|
|
174
|
+
if (r) {
|
|
175
175
|
return {
|
|
176
176
|
id,
|
|
177
177
|
parentID: r.parentID,
|
|
@@ -194,8 +194,9 @@ export default class WorkflowStorage {
|
|
|
194
194
|
const db = new WorkflowContext(this.driver);
|
|
195
195
|
if (text) {
|
|
196
196
|
// save..
|
|
197
|
-
await db.workflows.
|
|
198
|
-
|
|
197
|
+
await db.workflows.statements.update({ extra: text }, { id });
|
|
198
|
+
// await db.workflows.where({ id }, (p) => (x) => x.id === p.id)
|
|
199
|
+
// .update({ text}, (p) => (x) => ({ extra: p.text }));
|
|
199
200
|
return text;
|
|
200
201
|
}
|
|
201
202
|
const item = await db.workflows.where({ id }, (p) => (x) => x.id === p.id)
|
|
@@ -234,7 +235,7 @@ export default class WorkflowStorage {
|
|
|
234
235
|
await db.workflows.statements.update(state);
|
|
235
236
|
} else {
|
|
236
237
|
// await db.workflows.saveDirect({ mode: "upsert", changes: state });
|
|
237
|
-
await db.workflows.statements.upsert(
|
|
238
|
+
await db.workflows.statements.upsert(state);
|
|
238
239
|
}
|
|
239
240
|
await tx.commit();
|
|
240
241
|
}
|