@contember/engine-content-api 1.3.0-alpha.1 → 1.3.0-alpha.2

package/dist/src/types.d.ts

@@ -1,11 +1,10 @@
 import { Acl } from '@contember/schema';
 import { Client } from '@contember/database';
-import { Container } from '@contember/dic';
-import { ExecutionContainer } from './resolvers';
+import { ExecutionContainer } from './ExecutionContainer';
 export interface Context {
     db: Client;
     identityVariables: Acl.VariablesMap;
-    executionContainer: Container<ExecutionContainer>;
+    executionContainer: ExecutionContainer;
     timer: <T>(event: string, cb?: () => T) => Promise<T>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAEhD,MAAM,WAAW,OAAO;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAA;IACjD,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;CACrD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,WAAW,OAAO;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;CACrD"}

package/dist/tests/cases/bugs/bug-update-by-nested-unique.test.js

@@ -29,11 +29,9 @@ const schema = new schema_definition_1.SchemaBuilder()
                     parameters: ['en'],
                 },
                 {
-                    sql: (0, tags_1.SQL) `
-							with "newData_" as
-							(select ? :: text as "title", "root_"."id", "root_"."site_id"  from "public"."front_page" as "root_"  where "root_"."id" = ?)
-							update  "public"."front_page" set  "title" =  "newData_"."title"   from "newData_"  where "front_page"."id" = "newData_"."id"`,
-                    response: { rowCount: 1 },
+                    sql: (0, tags_1.SQL) `with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id", "root_"."site_id"  from "public"."front_page" as "root_"  where "root_"."id" = ?) 
+							update  "public"."front_page" set  "title" =  "newData_"."title"   from "newData_"  where "front_page"."id" = "newData_"."id"  returning "title_old__"`,
+                    response: { rows: [{}] },
                     parameters: ['Hello', (0, testUuid_1.testUuid)(1)],
                 },
             ]),

package/dist/tests/cases/bugs/bug-update-by-nested-unique.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"bug-update-by-nested-unique.test.js","sourceRoot":"","sources":["../../../../tests/cases/bugs/bug-update-by-nested-unique.test.ts"],"names":[],"mappings":";;AAAA,8CAAyC;AACzC,yCAAwD;AACxD,yCAAyC;AACzC,iDAA6C;AAC7C,oEAA4D;AAC5D,mCAA6B;AAE7B,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,CAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAC/G;KACA,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;KACxG,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAChD,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;UAKF;QACR,QAAQ,EAAE;YACT,GAAG,IAAA,qBAAc,EAAC;gBACjB;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;+BAEkB;oBAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;oBACzC,UAAU,EAAE,CAAC,IAAI,CAAC;iBAClB;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;qIAGwH;oBAChI,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE;oBACzB,UAAU,EAAE,CAAC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;iBAClC;aACD,CAAC;SACF;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,eAAe,EAAE;oBAChB,EAAE,EAAE,IAAI;iBACR;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"bug-update-by-nested-unique.test.js","sourceRoot":"","sources":["../../../../tests/cases/bugs/bug-update-by-nested-unique.test.ts"],"names":[],"mappings":";;AAAA,8CAAyC;AACzC,yCAAwD;AACxD,yCAAyC;AACzC,iDAA6C;AAC7C,oEAA4D;AAC5D,mCAA6B;AAE7B,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,CAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAC/G;KACA,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;KACxG,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAChD,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;UAKF;QACR,QAAQ,EAAE;YACT,GAAG,IAAA,qBAAc,EAAC;gBACjB;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;+BAEkB;oBAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;oBACzC,UAAU,EAAE,CAAC,IAAI,CAAC;iBAClB;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;8JACiJ;oBACzJ,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE;oBACxB,UAAU,EAAE,CAAC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;iBAClC;aACD,CAAC;SACF;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,eAAe,EAAE;oBAChB,EAAE,EAAE,IAAI;iBACR;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.js

@@ -14,9 +14,9 @@ var SeqModel;
     SeqModel.Order = Order;
 })(SeqModel || (SeqModel = {}));
 (0, vitest_1.test)('insert author with id', async () => {
-    const schema = schema_definition_1.SchemaDefinition.createModel(SeqModel);
+    const model = schema_definition_1.SchemaDefinition.createModel(SeqModel);
     await (0, engine_api_tester_1.executeDbTest)({
-        schema: schema,
+        schema: { model },
         query: (0, tags_1.GQL) `
           mutation {
               createOrder(data: {}) {

package/dist/tests/cases/integration/graphQlDb/insert/insertSequence.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"insertSequence.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/insert/insertSequence.test.ts"],"names":[],"mappings":";;AAAA,oEAAsE;AACtE,+CAA0C;AAC1C,mCAA6B;AAC7B,oEAA4D;AAE5D,IAAU,QAAQ,CAIjB;AAJD,WAAU,QAAQ;IACjB,MAAa,KAAK;QAAlB;YACC,UAAK,GAAG,oCAAG,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAA;QAC7C,CAAC;KAAA;IAFY,cAAK,QAEjB,CAAA;AACF,CAAC,EAJS,QAAQ,KAAR,QAAQ,QAIjB;AAED,IAAA,aAAI,EAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACxC,MAAM,MAAM,GAAG,oCAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;IACxC,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;YAOA;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE;YACP,WAAW,EAAE;gBACZ,IAAI,EAAE;oBACL,KAAK,EAAE,CAAC;iBACR;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"insertSequence.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/insert/insertSequence.test.ts"],"names":[],"mappings":";;AAAA,oEAAsE;AACtE,+CAA0C;AAC1C,mCAA6B;AAC7B,oEAA4D;AAE5D,IAAU,QAAQ,CAIjB;AAJD,WAAU,QAAQ;IACjB,MAAa,KAAK;QAAlB;YACC,UAAK,GAAG,oCAAG,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAA;QAC7C,CAAC;KAAA;IAFY,cAAK,QAEjB,CAAA;AACF,CAAC,EAJS,QAAQ,KAAR,QAAQ,QAIjB;AAED,IAAA,aAAI,EAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACxC,MAAM,KAAK,GAAG,oCAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;IACvC,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;YAOA;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE;YACP,WAAW,EAAE;gBACZ,IAAI,EAAE;oBACL,KAAK,EAAE,CAAC;iBACR;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.js

@@ -32,7 +32,7 @@ var Model;
 })(Model || (Model = {}));
 (0, vitest_1.test)('create redirect to non-existing target', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema: schema_definition_1.SchemaDefinition.createModel(Model),
+        schema: { model: schema_definition_1.SchemaDefinition.createModel(Model) },
         query: (0, tags_1.GQL) `
 		mutation {
   createRedirect(

package/dist/tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"bug-freeze-connect-missing-one.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.ts"],"names":[],"mappings":";;;;;;;;AAAA,mCAA6B;AAC7B,oEAAsE;AACtE,+CAA0C;AAC1C,oEAA4D;AAE5D,IAAU,KAAK,CAYd;AAZD,WAAU,KAAK;IAEd,IAAa,GAAG,GAAhB,MAAa,GAAG;QAAhB;YACC,QAAG,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAA;YAClC,aAAQ,GAA4B,oCAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC,YAAY,EAAE,CAAA;QACpG,CAAC;KAAA,CAAA;IAHY,GAAG;QADf,oCAAG,CAAC,MAAM,CAAC,KAAK,CAAC;OACL,GAAG,CAGf;IAHY,SAAG,MAGf,CAAA;IAED,MAAa,QAAQ;QAArB;YACC,QAAG,GAAG,oCAAG,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;YAErD,gBAAW,GAAG,oCAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAClC,CAAC;KAAA;IAJY,cAAQ,WAIpB,CAAA;AACF,CAAC,EAZS,KAAK,KAAL,KAAK,QAYd;AACD,IAAA,aAAI,EAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;IACzD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,oCAAG,CAAC,WAAW,CAAC,KAAK,CAAC;QAC9B,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;GAYT;QACD,IAAI,EAAE,EAAE;QACR,cAAc,EAAE,EAAE;QAClB,MAAM,EAAE;YACP,cAAc,EAAE;gBACf,EAAE,EAAE,KAAK;gBACT,YAAY,EAAE,iFAAiF;aAC/F;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"bug-freeze-connect-missing-one.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.ts"],"names":[],"mappings":";;;;;;;;AAAA,mCAA6B;AAC7B,oEAAsE;AACtE,+CAA0C;AAC1C,oEAA4D;AAE5D,IAAU,KAAK,CAYd;AAZD,WAAU,KAAK;IAEd,IAAa,GAAG,GAAhB,MAAa,GAAG;QAAhB;YACC,QAAG,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAA;YAClC,aAAQ,GAA4B,oCAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC,YAAY,EAAE,CAAA;QACpG,CAAC;KAAA,CAAA;IAHY,GAAG;QADf,oCAAG,CAAC,MAAM,CAAC,KAAK,CAAC;OACL,GAAG,CAGf;IAHY,SAAG,MAGf,CAAA;IAED,MAAa,QAAQ;QAArB;YACC,QAAG,GAAG,oCAAG,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;YAErD,gBAAW,GAAG,oCAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAClC,CAAC;KAAA;IAJY,cAAQ,WAIpB,CAAA;AACF,CAAC,EAZS,KAAK,KAAL,KAAK,QAYd;AACD,IAAA,aAAI,EAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;IACzD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE,oCAAG,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QACzC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;GAYT;QACD,IAAI,EAAE,EAAE;QACR,cAAc,EAAE,EAAE;QAClB,MAAM,EAAE;YACP,cAAc,EAAE;gBACf,EAAE,EAAE,KAAK;gBACT,YAAY,EAAE,iFAAiF;aAC/F;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/update/deferedConstraints.test.js

@@ -6,20 +6,20 @@ const tags_1 = require("../../../../src/tags");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
 (0, vitest_1.test)('delete without deferring constraints', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema: new schema_definition_1.SchemaBuilder()
-            .entity('Post', entity => entity
-            .column('slug')
-            .unique(['slug']))
-            .entity('Attachment', entity => entity
-            .column('slug')
-            .manyHasOne('post', relation => relation.target('Post').inversedBy('attachments').notNull())
-            .unique(['slug']))
-            .entity('Reference', entity => entity
-            .column('slug')
-            .manyHasOne('post', relation => relation.target('Post').inversedBy('references').notNull())
-            .manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
-            .unique(['slug']))
-            .buildSchema(),
+        schema: { model: new schema_definition_1.SchemaBuilder()
+                .entity('Post', entity => entity
+                .column('slug')
+                .unique(['slug']))
+                .entity('Attachment', entity => entity
+                .column('slug')
+                .manyHasOne('post', relation => relation.target('Post').inversedBy('attachments').notNull())
+                .unique(['slug']))
+                .entity('Reference', entity => entity
+                .column('slug')
+                .manyHasOne('post', relation => relation.target('Post').inversedBy('references').notNull())
+                .manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
+                .unique(['slug']))
+                .buildSchema() },
         seed: [
             {
                 query: `mutation {
@@ -54,10 +54,10 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
         return: {
             transaction: {
                 ok: false,
-                errorMessage: 'Execution has failed:\nupdatePost.attachments.0: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000003 row(s) of entity Reference in relation attachment. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
+                errorMessage: 'Execution has failed:\nupdatePost.attachments.0: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000004 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000006 row(s) of entity Reference in relation attachment. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
                 updatePost: {
                     ok: false,
-                    errorMessage: 'Execution has failed:\nattachments.0: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000003 row(s) of entity Reference in relation attachment. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
+                    errorMessage: 'Execution has failed:\nattachments.0: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000004 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000006 row(s) of entity Reference in relation attachment. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
                 },
             },
         },
@@ -65,20 +65,20 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
 });
 (0, vitest_1.test)('delete with successfully deferring constraints', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema: new schema_definition_1.SchemaBuilder()
-            .entity('Post', entity => entity
-            .column('slug')
-            .unique(['slug']))
-            .entity('Attachment', entity => entity
-            .column('slug')
-            .manyHasOne('post', relation => relation.target('Post').inversedBy('attachments').notNull())
-            .unique(['slug']))
-            .entity('Reference', entity => entity
-            .column('slug')
-            .manyHasOne('post', relation => relation.target('Post').inversedBy('references').notNull())
-            .manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
-            .unique(['slug']))
-            .buildSchema(),
+        schema: { model: new schema_definition_1.SchemaBuilder()
+                .entity('Post', entity => entity
+                .column('slug')
+                .unique(['slug']))
+                .entity('Attachment', entity => entity
+                .column('slug')
+                .manyHasOne('post', relation => relation.target('Post').inversedBy('attachments').notNull())
+                .unique(['slug']))
+                .entity('Reference', entity => entity
+                .column('slug')
+                .manyHasOne('post', relation => relation.target('Post').inversedBy('references').notNull())
+                .manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
+                .unique(['slug']))
+                .buildSchema() },
         seed: [
             {
                 query: `mutation {
@@ -124,20 +124,20 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
 });
 (0, vitest_1.test)('delete with unsuccessfully deferring constraints', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema: new schema_definition_1.SchemaBuilder()
-            .entity('Post', entity => entity
-            .column('slug')
-            .unique(['slug']))
-            .entity('Attachment', entity => entity
-            .column('slug')
-            .manyHasOne('post', relation => relation.target('Post').inversedBy('attachments').notNull())
-            .unique(['slug']))
-            .entity('Reference', entity => entity
-            .column('slug')
-            .manyHasOne('post', relation => relation.target('Post').inversedBy('references').notNull())
-            .manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
-            .unique(['slug']))
-            .buildSchema(),
+        schema: { model: new schema_definition_1.SchemaBuilder()
+                .entity('Post', entity => entity
+                .column('slug')
+                .unique(['slug']))
+                .entity('Attachment', entity => entity
+                .column('slug')
+                .manyHasOne('post', relation => relation.target('Post').inversedBy('attachments').notNull())
+                .unique(['slug']))
+                .entity('Reference', entity => entity
+                .column('slug')
+                .manyHasOne('post', relation => relation.target('Post').inversedBy('references').notNull())
+                .manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
+                .unique(['slug']))
+                .buildSchema() },
         seed: [
             {
                 query: `mutation {
@@ -172,7 +172,7 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
         return: {
             transaction: {
                 ok: false,
-                errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000002 of entity Attachment, because it is still referenced from Reference::attachment. This is possibly caused by ACL denial or by missing "on delete cascade")',
+                errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000004 of entity Attachment, because it is still referenced from Reference::attachment. This is possibly caused by ACL denial or by missing "on delete cascade")',
                 updatePost: {
                     ok: false,
                     errorMessage: null,

package/dist/tests/cases/integration/graphQlDb/update/deferedConstraints.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"deferedConstraints.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/deferedConstraints.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deferedConstraints.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/deferedConstraints.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/integration/graphQlDb/update/failedDelete.test.js

@@ -6,10 +6,10 @@ const tags_1 = require("../../../../src/tags");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
 (0, vitest_1.test)('fails when deleting entity without proper cascade', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema: new schema_definition_1.SchemaBuilder()
-            .entity('Post', entity => entity.column('slug').unique(['slug']))
-            .entity('PostLocales', entity => entity.manyHasOne('post', relation => relation.target('Post').inversedBy('locales')).column('title'))
-            .buildSchema(),
+        schema: { model: new schema_definition_1.SchemaBuilder()
+                .entity('Post', entity => entity.column('slug').unique(['slug']))
+                .entity('PostLocales', entity => entity.manyHasOne('post', relation => relation.target('Post').inversedBy('locales')).column('title'))
+                .buildSchema() },
         seed: [
             {
                 query: `mutation {
@@ -33,7 +33,7 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
         }`,
         return: {
             deletePost: {
-                errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000001 row(s) of entity Post, because it is still referenced from 123e4567-e89b-12d3-a456-000000000002 row(s) of entity PostLocales in relation post. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
+                errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000003 row(s) of entity Post, because it is still referenced from 123e4567-e89b-12d3-a456-000000000004 row(s) of entity PostLocales in relation post. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
                 node: null,
             },
         },

package/dist/tests/cases/integration/graphQlDb/update/failedDelete.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"failedDelete.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/failedDelete.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAE1C,oEAA4D;AAE5D,IAAA,aAAI,EAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;IACpE,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CACxB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CACtC;aACA,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAC/B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpG;aACA,WAAW,EAAE;QACf,IAAI,EAAE;YACL;gBACC,KAAK,EAAE;;;;;;;MAOL;aACF;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;UAQF;QACR,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,YAAY,EAAE,6XAA6X;gBAC3Y,IAAI,EAAE,IAAI;aACV;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"failedDelete.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/failedDelete.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAE1C,oEAA4D;AAE5D,IAAA,aAAI,EAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;IACpE,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,iCAAa,EAAE;iBAClC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CACxB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CACtC;iBACA,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAC/B,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACpG;iBACA,WAAW,EAAE,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE;;;;;;;MAOL;aACF;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;UAQF;QACR,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,YAAY,EAAE,6XAA6X;gBAC3Y,IAAI,EAAE,IAAI;aACV;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/update/invalidInput.test.js

@@ -5,14 +5,14 @@ const schema_1 = require("@contember/schema");
 const vitest_1 = require("vitest");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
 const tags_1 = require("../../../../src/tags");
-const schema = new schema_definition_1.SchemaBuilder()
+const model = new schema_definition_1.SchemaBuilder()
     .entity('Post', e => e
     .column('slug', c => c.type(schema_1.Model.ColumnType.String).unique())
     .column('createdAt', c => c.type(schema_1.Model.ColumnType.DateTime)))
     .buildSchema();
 (0, vitest_1.test)('returns error for invalid date input', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema,
+        schema: { model },
         seed: [
             {
                 query: (0, tags_1.GQL) `mutation {

package/dist/tests/cases/integration/graphQlDb/update/invalidInput.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidInput.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/invalidInput.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAAqC;AACrC,oEAA4D;AAC5D,+CAA0C;AAE1C,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;KACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;KAC7D,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAC7D;KACA,WAAW,EAAE,CAAA;AACf,IAAA,aAAI,EAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM;QACN,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;QAIN;aACJ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;YAQA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,wDAAwD,EAAE,CAAC;aACzG;SACD;QACD,cAAc,EAAE,EAAE;KAClB,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"invalidInput.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/invalidInput.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAAqC;AACrC,oEAA4D;AAC5D,+CAA0C;AAE1C,MAAM,KAAK,GAAG,IAAI,iCAAa,EAAE;KAC/B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;KACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;KAC7D,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAC7D;KACA,WAAW,EAAE,CAAA;AACf,IAAA,aAAI,EAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;QAIN;aACJ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;YAQA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,wDAAwD,EAAE,CAAC;aACzG;SACD;QACD,cAAc,EAAE,EAAE;KAClB,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.js

@@ -6,7 +6,7 @@ const vitest_1 = require("vitest");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
 const tags_1 = require("../../../../src/tags");
 const testUuid_1 = require("../../../../src/testUuid");
-const schema = new schema_definition_1.SchemaBuilder()
+const model = new schema_definition_1.SchemaBuilder()
     .entity('Site', e => e
     .column('slug', c => c.unique().type(schema_1.Model.ColumnType.String))
     .oneHasOne('contactPage', r => r.target('ContactPage').inversedBy('site').inverseNotNull()))
@@ -14,7 +14,7 @@ const schema = new schema_definition_1.SchemaBuilder()
     .buildSchema();
 (0, vitest_1.test)('update site & create contact page', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema,
+        schema: { model },
         seed: [
             {
                 query: (0, tags_1.GQL) `mutation {
@@ -35,14 +35,14 @@ const schema = new schema_definition_1.SchemaBuilder()
             },
         },
         expectDatabase: {
-            site: [{ id: (0, testUuid_1.testUuid)(1), slug: 'en', contact_page_id: (0, testUuid_1.testUuid)(2) }],
-            contact_page: [{ id: (0, testUuid_1.testUuid)(2), title: 'Test' }],
+            site: [{ id: (0, testUuid_1.testUuid)(3), slug: 'en', contact_page_id: (0, testUuid_1.testUuid)(5) }],
+            contact_page: [{ id: (0, testUuid_1.testUuid)(5), title: 'Test' }],
         },
     });
 });
 (0, vitest_1.test)('update site & try to create contact page which however exists', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema,
+        schema: { model },
         seed: [
             {
                 query: (0, tags_1.GQL) `mutation {
@@ -71,8 +71,8 @@ const schema = new schema_definition_1.SchemaBuilder()
             },
         },
         expectDatabase: {
-            site: [{ id: (0, testUuid_1.testUuid)(1), slug: 'en', contact_page_id: (0, testUuid_1.testUuid)(2) }],
-            contact_page: [{ id: (0, testUuid_1.testUuid)(2), title: 'Test' }],
+            site: [{ id: (0, testUuid_1.testUuid)(3), slug: 'en', contact_page_id: (0, testUuid_1.testUuid)(4) }],
+            contact_page: [{ id: (0, testUuid_1.testUuid)(4), title: 'Test' }],
         },
     });
 });

package/dist/tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullChecksNotNull.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAC1C,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;KACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAE7D,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,CAAC,CAC5F;KACA,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC7C,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM;QACN,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;YAIA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,IAAI;aACR;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;YACrE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAClD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM;QACN,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;YAOA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE;oBACP;wBACC,IAAI,EAAE,4BAA4B;qBAClC;iBACD;aACD;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;YACrE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAClD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"nullChecksNotNull.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAC1C,uDAAmD;AAEnD,MAAM,KAAK,GAAG,IAAI,iCAAa,EAAE;KAC/B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;KACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAE7D,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,CAAC,CAC5F;KACA,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC7C,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;YAIA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,IAAI;aACR;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;YACrE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAClD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;YAOA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE;oBACP;wBACC,IAAI,EAAE,4BAA4B;qBAClC;iBACD;aACD;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;YACrE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAClD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.js

@@ -6,13 +6,13 @@ const vitest_1 = require("vitest");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
 const tags_1 = require("../../../../src/tags");
 const testUuid_1 = require("../../../../src/testUuid");
-const schema = new schema_definition_1.SchemaBuilder()
+const model = new schema_definition_1.SchemaBuilder()
     .entity('Site', e => e.column('slug', c => c.unique().type(schema_1.Model.ColumnType.String)))
     .entity('ContactPage', e => e.column('title').oneHasOne('site', r => r.target('Site').inversedBy('contactPage').notNull()))
     .buildSchema();
 (0, vitest_1.test)('update site & create contact page', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema,
+        schema: { model },
         seed: [
             {
                 query: (0, tags_1.GQL) `mutation {
@@ -33,14 +33,14 @@ const schema = new schema_definition_1.SchemaBuilder()
             },
         },
         expectDatabase: {
-            site: [{ id: (0, testUuid_1.testUuid)(1), slug: 'en' }],
-            contact_page: [{ site_id: (0, testUuid_1.testUuid)(1), id: (0, testUuid_1.testUuid)(2), title: 'Test' }],
+            site: [{ id: (0, testUuid_1.testUuid)(3), slug: 'en' }],
+            contact_page: [{ site_id: (0, testUuid_1.testUuid)(3), id: (0, testUuid_1.testUuid)(5), title: 'Test' }],
         },
     });
 });
 (0, vitest_1.test)('update site & try to create contact page which however exists', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema,
+        schema: { model },
         seed: [
             {
                 query: (0, tags_1.GQL) `mutation {
@@ -69,8 +69,8 @@ const schema = new schema_definition_1.SchemaBuilder()
             },
         },
         expectDatabase: {
-            site: [{ id: (0, testUuid_1.testUuid)(1), slug: 'en' }],
-            contact_page: [{ site_id: (0, testUuid_1.testUuid)(1), id: (0, testUuid_1.testUuid)(2), title: 'Test' }],
+            site: [{ id: (0, testUuid_1.testUuid)(3), slug: 'en' }],
+            contact_page: [{ site_id: (0, testUuid_1.testUuid)(3), id: (0, testUuid_1.testUuid)(4), title: 'Test' }],
         },
     });
 });

package/dist/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullChecksNullable.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/nullChecksNullable.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAC1C,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;KACpF,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAC1B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC,CAC9F;KACA,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM;QACN,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;YAIA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,IAAI;aACR;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACvC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SACxE;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM;QACN,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;YAOA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE;oBACP;wBACC,IAAI,EAAE,4BAA4B;qBAClC;iBACD;aACD;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACvC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SACxE;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"nullChecksNullable.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/nullChecksNullable.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAC1C,uDAAmD;AAEnD,MAAM,KAAK,GAAG,IAAI,iCAAa,EAAE;KAC/B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;KACpF,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,CAC1B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,CAAC,CAC9F;KACA,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;YAIA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,IAAI;aACR;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACvC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SACxE;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;YAOA;QACV,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE;oBACP;wBACC,IAAI,EAAE,4BAA4B;qBAClC;iBACD;aACD;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACvC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SACxE;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.js

@@ -5,12 +5,12 @@ const schema_1 = require("@contember/schema");
 const vitest_1 = require("vitest");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
 const tags_1 = require("../../../../src/tags");
-const schema = new schema_definition_1.SchemaBuilder()
+const model = new schema_definition_1.SchemaBuilder()
     .entity('Site', e => e.column('slug', c => c.unique().type(schema_1.Model.ColumnType.String)))
     .buildSchema();
 (0, vitest_1.test)('fail when creating a non-unique site', async () => {
     await (0, engine_api_tester_1.executeDbTest)({
-        schema,
+        schema: { model },
         seed: [
             {
                 query: (0, tags_1.GQL) `mutation {

package/dist/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"uniqueConstraint.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/uniqueConstraint.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAE1C,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAC/D;KACA,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM;QACN,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;gBAKI;QACd,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,YAAY,EAAE,4HAA4H;aAC1I;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"uniqueConstraint.test.js","sourceRoot":"","sources":["../../../../../../tests/cases/integration/graphQlDb/update/uniqueConstraint.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6B;AAC7B,oEAA4D;AAC5D,+CAA0C;AAE1C,MAAM,KAAK,GAAG,IAAI,iCAAa,EAAE;KAC/B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAC/D;KACA,WAAW,EAAE,CAAA;AAEf,IAAA,aAAI,EAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,IAAA,iCAAa,EAAC;QACnB,MAAM,EAAE,EAAE,KAAK,EAAE;QACjB,IAAI,EAAE;YACL;gBACC,KAAK,EAAE,IAAA,UAAG,EAAA;;;;gBAIE;aACZ;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;gBAKI;QACd,MAAM,EAAE;YACP,UAAU,EAAE;gBACX,EAAE,EAAE,KAAK;gBACT,YAAY,EAAE,4HAA4H;aAC1I;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.js

@@ -40,11 +40,11 @@ const testUuid_1 = require("../../../../../src/testUuid");
                     },
                 },
                 {
-                    sql: (0, tags_1.SQL) `with "newdata_" as (select ? :: uuid as "category_id", "root_"."id", "root_"."name" from "public"."post" as "root_" where "root_"."id" = ?)
-						update "public"."post" set "category_id" = "newdata_"."category_id" from "newdata_" where "post"."id" = "newdata_"."id"`,
+                    sql: (0, tags_1.SQL) `with "newData_" as (select ? :: uuid as "category_id", "root_"."category_id" as "category_id_old__", "root_"."id", "root_"."name"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "category_id" =  "newData_"."category_id"   from "newData_"  where "post"."id" = "newData_"."id"  returning "category_id_old__"`,
                     parameters: [(0, testUuid_1.testUuid)(1), (0, testUuid_1.testUuid)(5)],
                     response: {
-                        rowCount: 1,
+                        rows: [{ category_id_old__: (0, testUuid_1.testUuid)(99) }],
                     },
                 },
                 {

package/dist/tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAiE;AACjE,oEAA4D;AAC5D,8CAAyC;AACzC,kDAAkD;AAClD,0DAAsD;AAEtD,IAAA,aAAI,EAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;aACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACpD,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CACvE;aACA,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/E,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;mFAEuE,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;;;YAKlF;QACV,QAAQ,EAAE;YACT,GAAG,IAAA,qBAAc,EAAC;gBACjB;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;qHACwG;oBAChH,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,aAAa,CAAC;oBACxC,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;qBAC3B;iBACD;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA,4EAA4E;oBACpF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACzB,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;qBAC3B;iBACD;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;8HACiH;oBACzH,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACtC,QAAQ,EAAE;wBACT,QAAQ,EAAE,CAAC;qBACX;iBACD;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA,6FAA6F;oBACrG,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACzB,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;qBAChC;iBACD;aACD,CAAC;SACF;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,cAAc,EAAE;oBACf,IAAI,EAAE;wBACL,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"connect.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAiE;AACjE,oEAA4D;AAC5D,8CAAyC;AACzC,kDAAkD;AAClD,0DAAsD;AAEtD,IAAA,aAAI,EAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;aACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACpD,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CACvE;aACA,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aAC/E,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;mFAEuE,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;;;YAKlF;QACV,QAAQ,EAAE;YACT,GAAG,IAAA,qBAAc,EAAC;gBACjB;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;qHACwG;oBAChH,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,aAAa,CAAC;oBACxC,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;qBAC3B;iBACD;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA,4EAA4E;oBACpF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACzB,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;qBAC3B;iBACD;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;oKACuJ;oBAC/J,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACtC,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,iBAAiB,EAAE,IAAA,mBAAQ,EAAC,EAAE,CAAC,EAAE,CAAC;qBAC3C;iBACD;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA,6FAA6F;oBACrG,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACzB,QAAQ,EAAE;wBACT,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC;qBAChC;iBACD;aACD,CAAC;SACF;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,cAAc,EAAE;oBACf,IAAI,EAAE;wBACL,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=orderBy.test.d.ts.map

package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"orderBy.test.d.ts","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.ts"],"names":[],"mappings":""}

package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const test_1 = require("../../../../../src/test");
+const schema_definition_1 = require("@contember/schema-definition");
+const schema_1 = require("@contember/schema");
+const tags_1 = require("../../../../../src/tags");
+const testUuid_1 = require("../../../../../src/testUuid");
+(0, vitest_1.test)('Entity - explicit order by, default asc', async () => {
+    await (0, test_1.execute)({
+        schema: new schema_definition_1.SchemaBuilder()
+            .entity('Post', entity => entity.column('title', column => column.type(schema_1.Model.ColumnType.String)).orderBy('title'))
+            .buildSchema(),
+        query: (0, tags_1.GQL) `
+        query {
+          getPost(by: {id: "${(0, testUuid_1.testUuid)(1)}"}, filter: {title: {eq: "Foo"}}) {
+            id
+          }
+        }`,
+        executes: [
+            {
+                sql: (0, tags_1.SQL) `select "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ? and "root_"."title" = ?  order by "root_"."title" asc, "root_"."id" asc`,
+                response: { rows: [{ root_id: (0, testUuid_1.testUuid)(1) }] },
+                parameters: [(0, testUuid_1.testUuid)(1), 'Foo'],
+            },
+        ],
+        return: {
+            data: {
+                getPost: {
+                    id: (0, testUuid_1.testUuid)(1),
+                },
+            },
+        },
+    });
+});
+(0, vitest_1.test)('Entity - explicit order by desc', async () => {
+    await (0, test_1.execute)({
+        schema: new schema_definition_1.SchemaBuilder()
+            .entity('Post', entity => entity.column('title', column => column.type(schema_1.Model.ColumnType.String)).orderBy('title', schema_1.Model.OrderDirection.desc))
+            .buildSchema(),
+        query: (0, tags_1.GQL) `
+        query {
+          getPost(by: {id: "${(0, testUuid_1.testUuid)(1)}"}, filter: {title: {eq: "Foo"}}) {
+            id
+          }
+        }`,
+        executes: [
+            {
+                sql: (0, tags_1.SQL) `select "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ? and "root_"."title" = ?  order by "root_"."title" desc, "root_"."id" asc`,
+                response: { rows: [{ root_id: (0, testUuid_1.testUuid)(1) }] },
+                parameters: [(0, testUuid_1.testUuid)(1), 'Foo'],
+            },
+        ],
+        return: {
+            data: {
+                getPost: {
+                    id: (0, testUuid_1.testUuid)(1),
+                },
+            },
+        },
+    });
+});
+//# sourceMappingURL=orderBy.test.js.map

package/dist/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"orderBy.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAiD;AACjD,oEAA4D;AAC5D,8CAAyC;AACzC,kDAAkD;AAClD,0DAAsD;AAEtD,IAAA,aAAI,EAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;IAC1D,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACjH,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;8BAEkB,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;UAG/B;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;oHAEwG;gBAChH,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;gBAC9C,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,CAAC;aAChC;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,OAAO,EAAE;oBACR,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;iBACf;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAGF,IAAA,aAAI,EAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;IAClD,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,cAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;aAC5I,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;8BAEkB,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;UAG/B;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;qHAEyG;gBACjH,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;gBAC9C,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,CAAC;aAChC;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,OAAO,EAAE;oBACR,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;iBACf;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js

@@ -46,16 +46,10 @@ const testUuid_1 = require("../../../../../src/testUuid");
                     response: { rows: [{ id: (0, testUuid_1.testUuid)(1) }] },
                 },
                 {
-                    sql: (0, tags_1.SQL) `with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."author" as "root_"
-               where "root_"."id" = ? and "root_"."name" in (?, ?)) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id" and "newData_"."name" in (?, ?)`,
+                    sql: (0, tags_1.SQL) `with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ? and "root_"."name" in (?, ?)) 
+						update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id" and "newData_"."name" in (?, ?)  returning "name_old__"`,
                     parameters: ['John', (0, testUuid_1.testUuid)(1), 'John', 'Jack', 'John', 'Jack'],
-                    response: { rowCount: 1 },
+                    response: { rows: [{ name_old__: 'John' }] },
                 },
             ]),
         ],
@@ -108,16 +102,10 @@ const testUuid_1 = require("../../../../../src/testUuid");
                     response: { rows: [{ id: (0, testUuid_1.testUuid)(1) }] },
                 },
                 {
-                    sql: (0, tags_1.SQL) `with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."author" as "root_"
-               where false) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id" and false`,
+                    sql: (0, tags_1.SQL) `with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where false) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id" and false  returning "name_old__"`,
                     parameters: ['John'],
-                    response: 0,
+                    response: { rows: [] },
                 },
             ]),
         ],