@contember/engine-content-api 1.0.0 → 1.0.3
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/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.d.ts.map +1 -1
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js +2 -0
- package/dist/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.js.map +1 -1
- package/dist/src/mapper/Mapper.d.ts.map +1 -1
- package/dist/src/mapper/Mapper.js +2 -4
- package/dist/src/mapper/Mapper.js.map +1 -1
- package/dist/src/mapper/select/ConditionBuilder.d.ts +1 -1
- package/dist/src/mapper/select/ConditionBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/ConditionBuilder.js +5 -5
- package/dist/src/mapper/select/ConditionBuilder.js.map +1 -1
- package/dist/src/mapper/select/JoinVisitor.js +2 -2
- package/dist/src/mapper/select/JoinVisitor.js.map +1 -1
- package/dist/src/mapper/select/OrderByBuilder.js +1 -1
- package/dist/src/mapper/select/OrderByBuilder.js.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts +1 -1
- package/dist/src/mapper/select/SelectBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/SelectBuilder.js +3 -4
- package/dist/src/mapper/select/SelectBuilder.js.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/WhereBuilder.js +4 -3
- package/dist/src/mapper/select/WhereBuilder.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.js.map +1 -1
- package/dist/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.js +87 -0
- package/dist/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts +2 -0
- package/src/mapper/Mapper.ts +2 -5
- package/src/mapper/select/ConditionBuilder.ts +5 -4
- package/src/mapper/select/JoinVisitor.ts +2 -2
- package/src/mapper/select/OrderByBuilder.ts +1 -1
- package/src/mapper/select/SelectBuilder.ts +3 -5
- package/src/mapper/select/WhereBuilder.ts +5 -2
- package/tests/cases/integration/graphQlRequests/query/filter/manyHasManyOwnerRelation.test.ts +1 -0
- package/tests/cases/integration/graphQlRequests/query/relations/oneHasMany.test.ts +89 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;
|
|
1
|
+
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,sCAAsC,EAAE,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;AAGtF,qBAAa,oCAAqC,YACjD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC,EACrE,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAArB,qBAAqB,EAAE,2BAA2B;IAE/E,eAAe,CACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,QAAQ,CAAC,sCAAsC,CAAC;IAInD,sBAAsB,CACrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,QAAQ,CAAC,sCAAsC,CAAC;IAInD,uBAAuB,CACtB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,QAAQ,CAAC,sCAAsC,CAAC;IAInD,OAAO,CAAC,WAAW;IAenB,WAAW;IAIX,eAAe;IAIf,qBAAqB;IAIrB,oBAAoB;CAGpB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PaginatedHasManyFieldProviderVisitor = void 0;
|
|
4
4
|
const utils_1 = require("../../utils");
|
|
5
|
+
const schema_1 = require("../../schema");
|
|
5
6
|
class PaginatedHasManyFieldProviderVisitor {
|
|
6
7
|
constructor(paginatedFieldFactory) {
|
|
7
8
|
this.paginatedFieldFactory = paginatedFieldFactory;
|
|
@@ -22,6 +23,7 @@ class PaginatedHasManyFieldProviderVisitor {
|
|
|
22
23
|
extensions: {
|
|
23
24
|
relationName: relation.name,
|
|
24
25
|
},
|
|
26
|
+
resolve: schema_1.aliasAwareResolver,
|
|
25
27
|
},
|
|
26
28
|
};
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":";;;AAGA,uCAAmD;
|
|
1
|
+
{"version":3,"file":"PaginatedHasManyFieldProviderVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyFieldProviderVisitor.ts"],"names":[],"mappings":";;;AAGA,uCAAmD;AAEnD,yCAAiD;AAEjD,MAAa,oCAAoC;IAIhD,YAA6B,qBAAkD;QAAlD,0BAAqB,GAArB,qBAAqB,CAA6B;IAAG,CAAC;IAEnF,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,sBAAsB,CACrB,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,uBAAuB,CACtB,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,QAAwB;QAExB,OAAO;YACN,CAAC,WAAW,IAAA,6BAAqB,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACpD,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACvD,UAAU,EAAE;oBACX,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC3B;gBACD,OAAO,EAAE,2BAAkB;aAC3B;SACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,OAAO,EAAE,CAAA;IACV,CAAC;IAED,eAAe;QACd,OAAO,EAAE,CAAA;IACV,CAAC;IAED,qBAAqB;QACpB,OAAO,EAAE,CAAA;IACV,CAAC;IAED,oBAAoB;QACnB,OAAO,EAAE,CAAA;IACV,CAAC;CACD;AA/DD,oFA+DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapper.d.ts","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAkB,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AACjE,OAAO,EAA8B,kBAAkB,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,qBAAa,MAAM;IAOjB,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,EAAE,EAAE,QAAQ,CAAC,MAAM;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAhB7B,OAAO,CAAC,eAAe,CAA+C;IACtE,SAAgB,eAAe,yBAA+B;IAC9D,SAAgB,KAAK,QAAc;IACnC,SAAgB,gBAAgB,EAAE,gBAAgB,CAAA;gBAGhC,MAAM,EAAE,KAAK,CAAC,MAAM,EACrB,EAAE,EAAE,QAAQ,CAAC,MAAM,EAClB,kBAAkB,EAAE,kBAAkB,EACtC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW;IAK7B,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM;IAa7E,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACpG,MAAM,CAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACvC,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,0BAA0B,CAAC;IAmBzB,YAAY,CACxB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,GACvC,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAQxB,aAAa,CACzB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACvC,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC,QAAQ;YAYzC,UAAU;
|
|
1
|
+
{"version":3,"file":"Mapper.d.ts","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,10 +74,8 @@ class Mapper {
|
|
|
74
74
|
const selector = this.selectBuilderFactory.create(augmentedBuilder, hydrator);
|
|
75
75
|
const filterWithPredicates = this.predicatesInjector.inject(entity, inputWithOrder.args.filter || {});
|
|
76
76
|
const inputWithPredicates = inputWithOrder.withArg('filter', filterWithPredicates);
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
await selectPromise;
|
|
80
|
-
return rows;
|
|
77
|
+
selector.select(this, entity, inputWithPredicates, path, groupBy);
|
|
78
|
+
return await selector.execute(this.db);
|
|
81
79
|
}
|
|
82
80
|
async count(entity, filter) {
|
|
83
81
|
const path = this.pathFactory.create([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Input } from '@contember/schema';
|
|
2
2
|
import { ConditionBuilder as SqlConditionBuilder } from '@contember/database';
|
|
3
3
|
export declare class ConditionBuilder {
|
|
4
|
-
build(builder: SqlConditionBuilder, tableName: string, columnName: string, condition: Input.Condition<any>): SqlConditionBuilder;
|
|
4
|
+
build(builder: SqlConditionBuilder, tableName: string, columnName: string, columnType: string, condition: Input.Condition<any>): SqlConditionBuilder;
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=ConditionBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,gBAAgB,IAAI,mBAAmB,EAAY,MAAM,qBAAqB,CAAA;AAGrG,qBAAa,gBAAgB;IACrB,KAAK,CACX,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAC7B,mBAAmB;CA8CtB"}
|
|
1
|
+
{"version":3,"file":"ConditionBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,gBAAgB,IAAI,mBAAmB,EAAY,MAAM,qBAAqB,CAAA;AAGrG,qBAAa,gBAAgB;IACrB,KAAK,CACX,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAC7B,mBAAmB;CA8CtB"}
|
|
@@ -4,7 +4,7 @@ exports.ConditionBuilder = void 0;
|
|
|
4
4
|
const database_1 = require("@contember/database");
|
|
5
5
|
const exception_1 = require("../../exception");
|
|
6
6
|
class ConditionBuilder {
|
|
7
|
-
build(builder, tableName, columnName, condition) {
|
|
7
|
+
build(builder, tableName, columnName, columnType, condition) {
|
|
8
8
|
const keys = Object.keys(condition);
|
|
9
9
|
if (keys.length === 0) {
|
|
10
10
|
return builder;
|
|
@@ -15,13 +15,13 @@ class ConditionBuilder {
|
|
|
15
15
|
}
|
|
16
16
|
const columnIdentifier = [tableName, columnName];
|
|
17
17
|
const handler = {
|
|
18
|
-
and: (builder, expressions) => builder.and(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, expr), builder2)),
|
|
19
|
-
or: (builder, expressions) => builder.or(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, expr), builder2)),
|
|
20
|
-
not: (builder, expression) => builder.not(builder2 => this.build(builder2, tableName, columnName, expression)),
|
|
18
|
+
and: (builder, expressions) => builder.and(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, columnType, expr), builder2)),
|
|
19
|
+
or: (builder, expressions) => builder.or(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, columnType, expr), builder2)),
|
|
20
|
+
not: (builder, expression) => builder.not(builder2 => this.build(builder2, tableName, columnName, columnType, expression)),
|
|
21
21
|
eq: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.eq, value),
|
|
22
22
|
notEq: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.notEq, value),
|
|
23
23
|
isNull: (builder, value) => value ? builder.isNull(columnIdentifier) : builder.not(clause => clause.isNull(columnIdentifier)),
|
|
24
|
-
in: (builder, values) => builder.in(columnIdentifier, values),
|
|
24
|
+
in: (builder, values) => builder.in(columnIdentifier, values, columnType),
|
|
25
25
|
notIn: (builder, values) => builder.not(builder2 => builder2.in(columnIdentifier, values)),
|
|
26
26
|
lt: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.lt, value),
|
|
27
27
|
lte: (builder, value) => builder.compare(columnIdentifier, database_1.Operator.lte, value),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":";;;AACA,kDAAqG;AACrG,+CAA2C;AAE3C,MAAa,gBAAgB;IACrB,KAAK,CACX,OAA4B,EAC5B,SAAiB,EACjB,UAAkB,EAClB,SAA+B;QAE/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAA6C,CAAA;QAC/E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,OAAO,CAAA;SACd;QACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,IAAI,qBAAS,CAClB,oGAAoG;gBACnG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAC1B,CAAA;SACD;QACD,MAAM,gBAAgB,GAAkC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAE/E,MAAM,OAAO,GAKT;YACH,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ConditionBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/ConditionBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ class JoinVisitor {
|
|
|
45
45
|
visitManyHasManyOwning(entity, relation, targetEntity) {
|
|
46
46
|
const sourceAlias = this.path.back().getAlias();
|
|
47
47
|
const targetAlias = this.path.getAlias();
|
|
48
|
-
const joiningAlias =
|
|
48
|
+
const joiningAlias = this.path.back().for('x_' + this.path.getAlias()).getAlias();
|
|
49
49
|
return [
|
|
50
50
|
{
|
|
51
51
|
tableName: relation.joiningTable.tableName,
|
|
@@ -67,7 +67,7 @@ class JoinVisitor {
|
|
|
67
67
|
visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
|
|
68
68
|
const sourceAlias = this.path.back().getAlias();
|
|
69
69
|
const targetAlias = this.path.getAlias();
|
|
70
|
-
const joiningAlias =
|
|
70
|
+
const joiningAlias = this.path.back().for('x_' + this.path.getAlias()).getAlias();
|
|
71
71
|
return [
|
|
72
72
|
{
|
|
73
73
|
tableName: targetRelation.joiningTable.tableName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoinVisitor.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":";;;AAGA,MAAa,WAAW;IACvB,YAA6B,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAE3C,oBAAoB,CACnB,MAAoB,EACpB,QAAuC,EACvC,YAA0B;QAE1B,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU;gBAC/C,YAAY,EAAE,YAAY,CAAC,aAAa;aACxC;SACD,CAAA;IACF,CAAC;IAED,qBAAqB,CACpB,MAAoB,EACpB,QAAwC,EACxC,YAA0B,EAC1B,cAA6C;QAE7C,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU;aACrD;SACD,CAAA;IACF,CAAC;IAED,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B;QAE1B,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU;gBAC/C,YAAY,EAAE,YAAY,CAAC,aAAa;aACxC;SACD,CAAA;IACF,CAAC;IAED,eAAe,CACd,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO;YACN;gBACC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,UAAU;gBACrD,IAAI,EAAE,IAAI;aACV;SACD,CAAA;IACF,CAAC;IAED,sBAAsB,CACrB,MAAoB,EACpB,QAAyC,EACzC,YAA0B;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAA;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAA;QACxC,MAAM,YAAY,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"JoinVisitor.js","sourceRoot":"","sources":["../../../../src/mapper/select/JoinVisitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ class OrderByBuilder {
|
|
|
15
15
|
buildOne(qb, orderable, entity, path, orderBy) {
|
|
16
16
|
const entries = Object.entries(orderBy);
|
|
17
17
|
if (entries.length !== 1) {
|
|
18
|
-
const fields = entries.join(', ');
|
|
18
|
+
const fields = entries.map(it => it[0]).join(', ');
|
|
19
19
|
throw new exception_1.UserError('Order by: only one field is expected in each item of order by clause, got: ' + fields);
|
|
20
20
|
}
|
|
21
21
|
if (orderBy._random || orderBy._randomSeeded) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderByBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":";;;AAGA,kDAA0E;AAC1E,0DAAwE;AACxE,+CAA2C;AAE3C,MAAa,cAAc;IAC1B,YAA6B,MAAoB,EAAmB,WAAwB;QAA/D,WAAM,GAAN,MAAM,CAAc;QAAmB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAEzF,KAAK,CACX,EAAuC,EACvC,SAAoB,EACpB,MAAoB,EACpB,IAAU,EACV,OAAwB;QAExB,OAAO,OAAO,CAAC,MAAM,CACpB,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,EAC3F,CAAC,EAAE,EAAE,SAAS,CAAC,CACf,CAAA;IACF,CAAC;IAEO,QAAQ,CACf,EAAuC,EACvC,SAAoB,EACpB,MAAoB,EACpB,IAAU,EACV,OAAsB;QAEtB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACvC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"OrderByBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ export declare class SelectBuilder {
|
|
|
26
26
|
[key: string]: SelectExecutionHandler<any>;
|
|
27
27
|
}, pathFactory: PathFactory);
|
|
28
28
|
execute(db: Client): Promise<SelectRow[]>;
|
|
29
|
-
select(mapper: Mapper, entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, path: Path, groupBy?: string):
|
|
29
|
+
select(mapper: Mapper, entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, path: Path, groupBy?: string): void;
|
|
30
30
|
private selectInternal;
|
|
31
31
|
private getColumnValues;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAuB,aAAa,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAiC,MAAM,0BAA0B,CAAA;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAa,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAG7D,qBAAa,aAAa;IASxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAhB7B,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAoD;IAE9F,OAAO,CAAC,YAAY,CAAmC;gBAGrC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,EACjC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC,EAClC,QAAQ,EAAE,cAAc,EACxB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;KAAE,EAC9D,WAAW,EAAE,WAAW;IAG7B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SelectBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAuB,aAAa,IAAI,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAiC,MAAM,0BAA0B,CAAA;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAa,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAG7D,qBAAa,aAAa;IASxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAhB7B,OAAO,CAAC,QAAQ,CAEf;IACD,SAAgB,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAoD;IAE9F,OAAO,CAAC,YAAY,CAAmC;gBAGrC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,WAAW,EACjC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC,EAClC,QAAQ,EAAE,cAAc,EACxB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAA;KAAE,EAC9D,WAAW,EAAE,WAAW;IAG7B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAW/C,MAAM,CACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACvC,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM;IA8BjB,OAAO,CAAC,cAAc;YA0DR,eAAe;CAM7B"}
|
|
@@ -33,8 +33,8 @@ class SelectBuilder {
|
|
|
33
33
|
this.resolver(result);
|
|
34
34
|
return result;
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
select(mapper, entity, input, path, groupBy) {
|
|
37
|
+
this.selectInternal(mapper, entity, path, input);
|
|
38
38
|
const where = input.args.filter;
|
|
39
39
|
if (where) {
|
|
40
40
|
this.qb = this.whereBuilder.build(this.qb, entity, path, where);
|
|
@@ -55,9 +55,8 @@ class SelectBuilder {
|
|
|
55
55
|
}
|
|
56
56
|
this.qb = this.qb.limit(input.args.limit, input.args.offset);
|
|
57
57
|
}
|
|
58
|
-
await promise;
|
|
59
58
|
}
|
|
60
|
-
|
|
59
|
+
selectInternal(mapper, entity, path, input) {
|
|
61
60
|
if (!input.fields.find(it => it.name === entity.primary && it.alias === entity.primary)) {
|
|
62
61
|
input = input.withField(new inputProcessing_1.FieldNode(entity.primary, entity.primary, {}));
|
|
63
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":";;;AACA,0DAA2E;AAI3E,kDAAmG;AAMnG,2DAA6D;AAC7D,uCAAyC;AAEzC,MAAa,aAAa;IAQzB,YACkB,MAAoB,EACpB,YAA0B,EAC1B,cAA8B,EAC9B,WAAwB,EACjC,EAA2C,EAClC,QAAwB,EACxB,oBAA0C,EAC1C,cAA8D,EAC9D,WAAwB;QARxB,WAAM,GAAN,MAAM,CAAc;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACjC,OAAE,GAAF,EAAE,CAAyC;QAClC,aAAQ,GAAR,QAAQ,CAAgB;QACxB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgD;QAC9D,gBAAW,GAAX,WAAW,CAAa;QAhBlC,aAAQ,GAAiC,GAAG,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC3D,CAAC,CAAA;QACe,SAAI,GAAyB,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAA;QAEtF,iBAAY,GAA+B,IAAI,CAAA;IAYpD,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,EAAU;QAC9B,IAAI,MAAmB,CAAA;QACvB,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;SACvD;aAAM;YACN,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACpC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACrB,OAAO,MAAM,CAAA;IACd,CAAC;IAEM,
|
|
1
|
+
{"version":3,"file":"SelectBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/SelectBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,gBAAgB,IAAI,mBAAmB,EAAY,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEtG,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAHX,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW;IAGnC,KAAK,CACX,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,aAAa,GAAE,OAAe;IAKxB,aAAa,CACnB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACjH,aAAa,GAAE,OAAe;IAW/B,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"WhereBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,gBAAgB,IAAI,mBAAmB,EAAY,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEtG,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAHX,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,WAAW;IAGnC,KAAK,CACX,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,aAAa,GAAE,OAAe;IAKxB,aAAa,CACnB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,CAAC,aAAa,EAC1B,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,mBAAmB,KAAK,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACjH,aAAa,GAAE,OAAe;IAW/B,OAAO,CAAC,aAAa;IA6IrB,OAAO,CAAC,yBAAyB;IAqCjC,OAAO,CAAC,gCAAgC;CAuCxC;AAED,oBAAY,mBAAmB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAA"}
|
|
@@ -48,7 +48,7 @@ class WhereBuilder {
|
|
|
48
48
|
if ((0, utils_1.isIt)(relation, 'joiningColumn')) {
|
|
49
49
|
const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary);
|
|
50
50
|
if (primaryCondition !== null) {
|
|
51
|
-
return this.conditionBuilder.build(conditionBuilder, tableName, relation.joiningColumn.columnName, primaryCondition);
|
|
51
|
+
return this.conditionBuilder.build(conditionBuilder, tableName, relation.joiningColumn.columnName, targetEntity.fields[targetEntity.primary].columnType, primaryCondition);
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
joinList.push({ path: targetPath, entity, relationName: relation.name });
|
|
@@ -57,7 +57,7 @@ class WhereBuilder {
|
|
|
57
57
|
conditionBuilder = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, fieldName, {
|
|
58
58
|
visitColumn: (entity, column) => {
|
|
59
59
|
const subWhere = where[column.name];
|
|
60
|
-
return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, subWhere);
|
|
60
|
+
return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, column.columnType, subWhere);
|
|
61
61
|
},
|
|
62
62
|
visitOneHasOneInverse: joinedWhere,
|
|
63
63
|
visitOneHasOneOwning: joinedWhere,
|
|
@@ -100,7 +100,8 @@ class WhereBuilder {
|
|
|
100
100
|
.select(['junction_', fromColumn]);
|
|
101
101
|
const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary);
|
|
102
102
|
if (primaryCondition !== null) {
|
|
103
|
-
|
|
103
|
+
const columnType = targetEntity.fields[targetEntity.primary].columnType;
|
|
104
|
+
return augmentedBuilder.where(condition => this.conditionBuilder.build(condition, 'junction_', toColumn, columnType, primaryCondition));
|
|
104
105
|
}
|
|
105
106
|
augmentedBuilder = augmentedBuilder.join(targetEntity.tableName, 'root_', clause => clause.compareColumns(['junction_', toColumn], database_1.Operator.eq, ['root_', targetEntity.primary]));
|
|
106
107
|
return this.buildAdvanced(targetEntity, this.pathFactory.create([]), relationWhere, cb => augmentedBuilder.where(clause => cb(clause)), true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WhereBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/WhereBuilder.ts"],"names":[],"mappings":"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"}
|