@entity-access/entity-access 1.0.99 → 1.0.101
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/compiler/postgres/PostgreSqlMethodTransformer.d.ts.map +1 -1
- package/dist/compiler/postgres/PostgreSqlMethodTransformer.js +11 -0
- package/dist/compiler/postgres/PostgreSqlMethodTransformer.js.map +1 -1
- package/dist/compiler/sql-server/SqlServerSqlMethodTransformer.d.ts.map +1 -1
- package/dist/compiler/sql-server/SqlServerSqlMethodTransformer.js +11 -0
- package/dist/compiler/sql-server/SqlServerSqlMethodTransformer.js.map +1 -1
- package/dist/entity-query/EntityType.d.ts +5 -4
- package/dist/entity-query/EntityType.d.ts.map +1 -1
- package/dist/entity-query/EntityType.js.map +1 -1
- package/dist/model/EntityQuery.d.ts +2 -1
- package/dist/model/EntityQuery.d.ts.map +1 -1
- package/dist/model/EntityQuery.js +58 -4
- package/dist/model/EntityQuery.js.map +1 -1
- package/dist/model/IFilterWithParameter.d.ts +2 -0
- package/dist/model/IFilterWithParameter.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.d.ts +4 -2
- package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.js +114 -53
- package/dist/query/ast/ExpressionToSql.js.map +1 -1
- package/dist/sql/ISql.d.ts +5 -0
- package/dist/sql/ISql.d.ts.map +1 -1
- package/dist/tests/db-tests/tests/select-items-map.d.ts +3 -0
- package/dist/tests/db-tests/tests/select-items-map.d.ts.map +1 -0
- package/dist/tests/db-tests/tests/select-items-map.js +14 -0
- package/dist/tests/db-tests/tests/select-items-map.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/compiler/postgres/PostgreSqlMethodTransformer.ts +12 -1
- package/src/compiler/sql-server/SqlServerSqlMethodTransformer.ts +12 -1
- package/src/entity-query/EntityType.ts +6 -1
- package/src/model/EntityQuery.ts +63 -5
- package/src/model/IFilterWithParameter.ts +3 -0
- package/src/query/ast/ExpressionToSql.ts +140 -68
- package/src/sql/ISql.ts +5 -0
- package/src/tests/db-tests/tests/select-items-map.ts +20 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSqlMethodTransformer.d.ts","sourceRoot":"","sources":["../../../src/compiler/postgres/PostgreSqlMethodTransformer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAIrD,eAAO,MAAM,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"PostgreSqlMethodTransformer.d.ts","sourceRoot":"","sources":["../../../src/compiler/postgres/PostgreSqlMethodTransformer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAIrD,eAAO,MAAM,gBAAgB,EAAE,WA6J9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,2BAA2B,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAclH"}
|
|
@@ -7,6 +7,17 @@ export const PostgreSqlHelper = {
|
|
|
7
7
|
in(a, array) {
|
|
8
8
|
return prepareAny `${a} IN ${array}`;
|
|
9
9
|
},
|
|
10
|
+
coll: {
|
|
11
|
+
sum(a) {
|
|
12
|
+
return prepareAny `SUM(${a})`;
|
|
13
|
+
},
|
|
14
|
+
count(a) {
|
|
15
|
+
return prepareAny `COUNT(${a})`;
|
|
16
|
+
},
|
|
17
|
+
avg(a) {
|
|
18
|
+
return prepareAny `AVG(${a})`;
|
|
19
|
+
},
|
|
20
|
+
},
|
|
10
21
|
cast: {
|
|
11
22
|
asBigInt(a) {
|
|
12
23
|
return prepareAny `(${a} ::bigint)`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSqlMethodTransformer.js","sourceRoot":"","sources":["../../../src/compiler/postgres/PostgreSqlMethodTransformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAInC,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,gBAAgB,GAAgB;IACzC,GAAI,GAAG;IACP,EAAE,CAAC,CAAC,EAAE,KAAK;QACP,OAAO,UAAU,
|
|
1
|
+
{"version":3,"file":"PostgreSqlMethodTransformer.js","sourceRoot":"","sources":["../../../src/compiler/postgres/PostgreSqlMethodTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerSqlMethodTransformer.d.ts","sourceRoot":"","sources":["../../../src/compiler/sql-server/SqlServerSqlMethodTransformer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAErD,eAAO,MAAM,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"SqlServerSqlMethodTransformer.d.ts","sourceRoot":"","sources":["../../../src/compiler/sql-server/SqlServerSqlMethodTransformer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AAErD,eAAO,MAAM,kBAAkB,EAAE,WAkKhC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,6BAA6B,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAcpH"}
|
|
@@ -5,6 +5,17 @@ export const SqlServerSqlHelper = {
|
|
|
5
5
|
in(a, array) {
|
|
6
6
|
return prepareAny `${a} IN ${array}`;
|
|
7
7
|
},
|
|
8
|
+
coll: {
|
|
9
|
+
sum(a) {
|
|
10
|
+
return prepareAny `SUM(${a})`;
|
|
11
|
+
},
|
|
12
|
+
count(a) {
|
|
13
|
+
return prepareAny `COUNT(${a})`;
|
|
14
|
+
},
|
|
15
|
+
avg(a) {
|
|
16
|
+
return prepareAny `AVG(${a})`;
|
|
17
|
+
},
|
|
18
|
+
},
|
|
8
19
|
cast: {
|
|
9
20
|
asBigInt(a) {
|
|
10
21
|
return prepareAny `CAST(${a} as bigint)`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerSqlMethodTransformer.js","sourceRoot":"","sources":["../../../src/compiler/sql-server/SqlServerSqlMethodTransformer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAInC,MAAM,CAAC,MAAM,kBAAkB,GAAgB;IAC3C,GAAI,GAAG;IACP,EAAE,CAAC,CAAC,EAAE,KAAK;QACP,OAAO,UAAU,
|
|
1
|
+
{"version":3,"file":"SqlServerSqlMethodTransformer.js","sourceRoot":"","sources":["../../../src/compiler/sql-server/SqlServerSqlMethodTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,10 @@ import { IIndex } from "../decorators/IIndex.js";
|
|
|
5
5
|
import { IStringTransformer } from "../query/ast/IStringTransformer.js";
|
|
6
6
|
export declare const addOrCreateColumnSymbol: unique symbol;
|
|
7
7
|
export declare const addColumnSymbol: unique symbol;
|
|
8
|
+
export interface IEntityProperty {
|
|
9
|
+
field?: IColumn;
|
|
10
|
+
relation?: IEntityRelation;
|
|
11
|
+
}
|
|
8
12
|
/**
|
|
9
13
|
* DbQuery represents sql equivalent table with columns...
|
|
10
14
|
*/
|
|
@@ -26,10 +30,7 @@ export default class EntityType {
|
|
|
26
30
|
private selectOne;
|
|
27
31
|
constructor(original?: EntityType, namingConvention?: IStringTransformer);
|
|
28
32
|
[addOrCreateColumnSymbol](name: string): IColumn;
|
|
29
|
-
getProperty(name: string):
|
|
30
|
-
field: IColumn;
|
|
31
|
-
relation: IEntityRelation;
|
|
32
|
-
};
|
|
33
|
+
getProperty(name: string): IEntityProperty;
|
|
33
34
|
addColumn(c: IColumn): void;
|
|
34
35
|
getColumn(name: string): IColumn;
|
|
35
36
|
getField(name: string): IColumn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityType.d.ts","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAiB,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAErH,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AACnE,eAAO,MAAM,eAAe,eAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"EntityType.d.ts","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAIrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAiB,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAErH,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,uBAAuB,eAA8B,CAAC;AACnE,eAAO,MAAM,eAAe,eAA8B,CAAC;AAE3D,MAAM,WAAW,eAAe;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAGD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,SAAgB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEzC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,UAAU,EAAE,MAAM,CAAC;IAGnC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,SAAgB,SAAS,EAAE,eAAe,EAAE,CAAM;IAElD,SAAgB,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvC,SAAgB,IAAI,EAAE,OAAO,EAAE,CAAM;IAErC,SAAgB,OAAO,EAAE,OAAO,EAAE,CAAM;IAExC,IACW,kBAAkB,oEAO5B;IAED,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,WAAW,CAA2C;IAE9D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,SAAS,CAAkB;gBAEvB,QAAQ,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAAE,kBAAkB;IAUxE,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;IAM1C,SAAS,CAAC,CAAC,EAAE,OAAO;IAkBpB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAI5B,WAAW,CAAC,QAAQ,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,KAAA,KAAK,UAAU;IAiDnE,eAAe;;;;;;;;;;;;;;IAiBf,eAAe;;;;;;;;;;;;;;IAmBf,GAAG,CAAC,GAAG,EAAE,GAAG;CAWtB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":";;;;;;;;;AAKA,OAAO,EAAE,UAAU,EAAgB,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACrH,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAI7D,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AACnE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":";;;;;;;;;AAKA,OAAO,EAAE,UAAU,EAAgB,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACrH,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAI7D,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AACnE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAQ3D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAEX,SAAS,CAAgB;IAEzB,IAAI,CAAS;IACb,MAAM,CAAS;IACf,UAAU,CAAS;IAGnB,OAAO,GAAc,EAAE,CAAC;IAExB,SAAS,GAAsB,EAAE,CAAC;IAElC,OAAO,GAAa,EAAE,CAAC;IAEvB,IAAI,GAAc,EAAE,CAAC;IAErB,OAAO,GAAc,EAAE,CAAC;IAExC,IACW,kBAAkB;QACzB,OAAO,IAAI,CAAC,MAAM;YACd,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;gBAClB,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC1C,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC;YACF,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEO,QAAQ,GAAyB,IAAI,GAAG,EAAE,CAAC;IAC3C,SAAS,GAAyB,IAAI,GAAG,EAAE,CAAC;IAC5C,WAAW,GAAiC,IAAI,GAAG,EAAE,CAAC;IAEtD,SAAS,CAAkB;IAC3B,SAAS,CAAkB;IAEnC,YAAY,QAAqB,EAAE,gBAAqC;QACpE,IAAI,CAAC,QAAQ,EAAE;YACX,OAAO;SACV;QACD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/E,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC3H,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IAC1C,CAAC;IAED,CAAC,uBAAuB,CAAC,CAAC,IAAY;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAEM,WAAW,CAAC,IAAY;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAEM,SAAS,CAAC,CAAU;QAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE;YACV,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;YACnC,CAAC,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,CAAC,GAAG,EAAE;YACP,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACrB;aAAM;YACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACxB;IACL,CAAC;IAEM,SAAS,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAEM,QAAQ,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,QAAyB,EAAE,eAAmC;QACtE,kDAAkD;QAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE9C,aAAa;QACb,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACtD,IAAG,CAAC,QAAQ,EAAE;YACV,QAAQ,GAAG;gBACP,IAAI,EAAE,QAAQ,CAAC,UAAU;gBACzB,mCAAmC;gBACnC,UAAU,EAAE,QAAQ;gBACpB,QAAQ,EAAE,QAAQ;aACrB,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SACpD;QACD,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC;QAC/B,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC7B,IAAI,QAAQ,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAChC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;SAChC;QAED,IAAI,CAAC,eAAe,EAAE;YAClB,OAAO,QAAQ,CAAC;SACnB;QAED,kCAAkC;QAClC,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC/D,QAAQ,CAAC,aAAa,GAAG,WAAW,CAAC;QACrC,MAAM,eAAe,GAAoB;YACrC,IAAI,EAAE,QAAQ,CAAC,WAAW;YAC1B,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,QAAQ,CAAC,IAAI;YAC1B,gBAAgB,EAAE,IAAI,CAAC,SAAS;YAChC,iBAAiB,EAAE,IAAI;YACvB,QAAQ;YACR,iBAAiB,EAAE,IAAI;YACvB,YAAY,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YAC3D,eAAe,EAAE,QAAQ;YACzB,aAAa,EAAE,IAAI;SACtB,CAAC;QAEF,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACnE,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5C,eAAe,CAAC,eAAe,GAAG,QAAQ,CAAC;QAC3C,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC;QAC3C,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,eAAe;QAClB,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,OAAO,EAAE,GAAI,IAAI,CAAC,SAAS,EAAE,CAAC;SACjC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACvC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QACpD,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC;YACpC,MAAM;YACN,KAAK,EAAE,IAAI;YACX,eAAe,EAAE,EAAE;YACnB,MAAM;SACT,CAAC,CAAC;QACH,OAAO,EAAE,GAAI,IAAI,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IAEM,eAAe;QAClB,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,OAAO,EAAE,GAAI,IAAI,CAAC,SAAS,EAAE,CAAC;SACjC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACvC,MAAM,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QACpD,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC;QAChB,MAAM,MAAM,GAAG;YACX,aAAa,CAAC,GAAG;SACpB,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC;YACpC,MAAM;YACN,KAAK,EAAE,IAAI;YACX,eAAe,EAAE,EAAE;YACnB,MAAM;SACT,CAAC,CAAC;QACH,OAAO,EAAE,GAAI,IAAI,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IAEM,GAAG,CAAC,GAAQ;QACf,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACvC,IAAI,KAAK,KAAK,KAAK,CAAC,EAAE;gBAClB,SAAS;aACZ;YACD,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SAC5B;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CACJ;AA/JG;IAAC,aAAa;;;oDAQb"}
|
|
@@ -12,7 +12,7 @@ export default class EntityQuery<T = any> implements IOrderedEntityQuery<T>, IEn
|
|
|
12
12
|
signal?: AbortSignal;
|
|
13
13
|
constructor(p: Partial<EntityQuery<any>>);
|
|
14
14
|
select(p: any, fx: any): any;
|
|
15
|
-
map(
|
|
15
|
+
map(parameters: any, fx: any): any;
|
|
16
16
|
withSignal(signal: AbortSignal): any;
|
|
17
17
|
thenBy(parameters: any, fx: any): any;
|
|
18
18
|
thenByDescending(parameters: any, fx: any): any;
|
|
@@ -31,6 +31,7 @@ export default class EntityQuery<T = any> implements IOrderedEntityQuery<T>, IEn
|
|
|
31
31
|
orderByDescending(parameters: any, fx: any): any;
|
|
32
32
|
limit(n: number): any;
|
|
33
33
|
offset(n: number): any;
|
|
34
|
+
sum(parameters?: any, fx?: any): Promise<number>;
|
|
34
35
|
count(parameters?: any, fx?: any): Promise<number>;
|
|
35
36
|
private extend;
|
|
36
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"EntityQuery.d.ts","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":";AACA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAIzC,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAgG,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG5J,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9E,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,CAAC,GAAG,GAAG,CACpC,YAAW,mBAAmB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAE3C,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,UAAU,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC;gBACf,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAOzC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAI5B,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAsBlC,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG;IAIpC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAGrC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;IAIzC,KAAK,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,GAAG;IAQ7D,OAAO,CAAC,CAAC,EAAE,GAAG,GAAG,GAAG;IAQd,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;IAQtB,SAAS,IAAI,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC;IA6C7C,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW;IAmBlG,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC;IAOzB,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC;IAMzB,OAAO,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,EAAE,CAAC;KAAE;IAG3C,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAQtC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,GAAG;IAUhD,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIrB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAIhB,GAAG,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAyC/C,KAAK,CAAC,UAAU,CAAC,EAAC,GAAG,EAAE,EAAE,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAyCvD,OAAO,CAAC,MAAM;CAMjB"}
|
|
@@ -17,10 +17,25 @@ export default class EntityQuery {
|
|
|
17
17
|
select(p, fx) {
|
|
18
18
|
return this.map(p, fx);
|
|
19
19
|
}
|
|
20
|
-
map(
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
map(parameters, fx) {
|
|
21
|
+
return this.extend(parameters, fx, (select, body) => {
|
|
22
|
+
const fields = [];
|
|
23
|
+
switch (body.type) {
|
|
24
|
+
case "NewObjectExpression":
|
|
25
|
+
const noe = body;
|
|
26
|
+
for (const iterator of noe.properties) {
|
|
27
|
+
fields.push(ExpressionAs.create({
|
|
28
|
+
expression: iterator.expression,
|
|
29
|
+
alias: iterator.alias
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
break;
|
|
33
|
+
default:
|
|
34
|
+
fields.push(body);
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
return { ...select, fields };
|
|
38
|
+
});
|
|
24
39
|
}
|
|
25
40
|
withSignal(signal) {
|
|
26
41
|
return new EntityQuery({ ...this, signal });
|
|
@@ -150,6 +165,45 @@ export default class EntityQuery {
|
|
|
150
165
|
offset(n) {
|
|
151
166
|
return new EntityQuery({ ...this, selectStatement: { ...this.selectStatement, offset: n } });
|
|
152
167
|
}
|
|
168
|
+
async sum(parameters, fx) {
|
|
169
|
+
if (parameters !== void 0) {
|
|
170
|
+
return this.map(parameters, fx).sum();
|
|
171
|
+
}
|
|
172
|
+
const field = this.selectStatement.fields[0];
|
|
173
|
+
const select = { ...this.selectStatement, fields: [
|
|
174
|
+
ExpressionAs.create({
|
|
175
|
+
expression: CallExpression.create({
|
|
176
|
+
callee: Identifier.create({ value: "SUM" }),
|
|
177
|
+
arguments: [field]
|
|
178
|
+
}),
|
|
179
|
+
alias: Expression.identifier("c1")
|
|
180
|
+
})
|
|
181
|
+
],
|
|
182
|
+
orderBy: void 0
|
|
183
|
+
};
|
|
184
|
+
const nq = new EntityQuery({ ...this, selectStatement: select });
|
|
185
|
+
const scope = new DisposableScope();
|
|
186
|
+
const session = this.context.logger?.newSession() ?? Logger.nullLogger;
|
|
187
|
+
let query;
|
|
188
|
+
try {
|
|
189
|
+
query = this.context.driver.compiler.compileExpression(nq, select);
|
|
190
|
+
const reader = await this.context.connection.executeReader(query);
|
|
191
|
+
scope.register(reader);
|
|
192
|
+
for await (const iterator of reader.next()) {
|
|
193
|
+
return iterator.c1;
|
|
194
|
+
}
|
|
195
|
+
// this is special case when database does not return any count
|
|
196
|
+
// like sql server
|
|
197
|
+
return 0;
|
|
198
|
+
}
|
|
199
|
+
catch (error) {
|
|
200
|
+
session.error(`Failed executing ${query?.text}\r\n${error.stack ?? error}`);
|
|
201
|
+
throw error;
|
|
202
|
+
}
|
|
203
|
+
finally {
|
|
204
|
+
await scope.dispose();
|
|
205
|
+
}
|
|
206
|
+
}
|
|
153
207
|
async count(parameters, fx) {
|
|
154
208
|
if (parameters !== void 0) {
|
|
155
209
|
return this.where(parameters, fx).count();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EntityQuery.js","sourceRoot":"","sources":["../../src/model/EntityQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ export interface IBaseQuery<T> {
|
|
|
18
18
|
where<P, DT>(this: DT, parameters: P, fx: (p: P) => (x: T) => boolean): DT;
|
|
19
19
|
count(): Promise<number>;
|
|
20
20
|
count<P>(parameters: P, fx: (p: P) => (x: T) => boolean): Promise<number>;
|
|
21
|
+
sum(): Promise<number>;
|
|
22
|
+
sum<P>(parameters: P, fx: (p: P) => (x: T) => number): Promise<number>;
|
|
21
23
|
withSignal<DT>(this: DT, signal: AbortSignal): DT;
|
|
22
24
|
include<TR>(fx: (x: T) => TR | TR[]): IBaseQuery<T>;
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IFilterWithParameter.d.ts","sourceRoot":"","sources":["../../src/model/IFilterWithParameter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"IFilterWithParameter.d.ts","sourceRoot":"","sources":["../../src/model/IFilterWithParameter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import QueryCompiler from "../../compiler/QueryCompiler.js";
|
|
2
|
-
import EntityType from "../../entity-query/EntityType.js";
|
|
2
|
+
import EntityType, { IEntityProperty } from "../../entity-query/EntityType.js";
|
|
3
3
|
import EntityQuery from "../../model/EntityQuery.js";
|
|
4
|
-
import { BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, Identifier, InsertStatement, JoinExpression, MemberExpression, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement } from "./Expressions.js";
|
|
4
|
+
import { ArrowFunctionExpression, BigIntLiteral, BinaryExpression, BooleanLiteral, CallExpression, CoalesceExpression, ConditionalExpression, Constant, DeleteStatement, ExistsExpression, Expression, ExpressionAs, Identifier, InsertStatement, JoinExpression, MemberExpression, NewObjectExpression, NotExits, NullExpression, NumberLiteral, OrderByExpression, ParameterExpression, ReturnUpdated, SelectStatement, StringLiteral, TableLiteral, TemplateLiteral, UnionAllStatement, UpdateStatement, ValuesStatement } from "./Expressions.js";
|
|
5
5
|
import { ITextQuery } from "./IStringTransformer.js";
|
|
6
6
|
import ParameterScope from "./ParameterScope.js";
|
|
7
7
|
import Visitor from "./Visitor.js";
|
|
@@ -33,6 +33,8 @@ export default class ExpressionToSql extends Visitor<ITextQuery> {
|
|
|
33
33
|
visitBooleanLiteral({ value }: BooleanLiteral): ITextQuery;
|
|
34
34
|
visitTemplateLiteral(e: TemplateLiteral): ITextQuery;
|
|
35
35
|
visitCallExpression(e: CallExpression): ITextQuery;
|
|
36
|
+
expandMap(body: ArrowFunctionExpression, relation: IEntityProperty, e: CallExpression, parameter: ParameterExpression, targetType: EntityType): ITextQuery;
|
|
37
|
+
expandSome(body: ArrowFunctionExpression, relation: IEntityProperty, e: CallExpression, parameter: ParameterExpression, targetType: EntityType): ITextQuery;
|
|
36
38
|
visitIdentifier(e: Identifier): ITextQuery;
|
|
37
39
|
visitParameterExpression(pe: ParameterExpression): ITextQuery;
|
|
38
40
|
visitMemberExpression(me: MemberExpression): ITextQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ExpressionToSql.d.ts","sourceRoot":"","sources":["../../../src/query/ast/ExpressionToSql.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,59 +127,13 @@ export default class ExpressionToSql extends Visitor {
|
|
|
127
127
|
if (/^(some|any)$/i.test(chain[1])) {
|
|
128
128
|
const body = e.arguments[0];
|
|
129
129
|
if (body.type === "ArrowFunctionExpression") {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
: this.source.context.filteredQuery(relatedType, "include", false);
|
|
138
|
-
select = { ...query.selectStatement };
|
|
139
|
-
select.fields = [
|
|
140
|
-
NumberLiteral.create({ value: 1 })
|
|
141
|
-
];
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
select = relatedModel.selectOneNumber();
|
|
145
|
-
}
|
|
146
|
-
param1.model = relatedModel;
|
|
147
|
-
this.scope.create({ parameter: param1, model: relatedModel, selectStatement: select });
|
|
148
|
-
this.scope.alias(param1, select.sourceParameter, select);
|
|
149
|
-
select.sourceParameter = param1;
|
|
150
|
-
select[filteredSymbol] = true;
|
|
151
|
-
const targetKey = MemberExpression.create({
|
|
152
|
-
target: parameter,
|
|
153
|
-
property: Identifier.create({
|
|
154
|
-
value: targetType.keys[0].columnName
|
|
155
|
-
})
|
|
156
|
-
});
|
|
157
|
-
const relatedKey = MemberExpression.create({
|
|
158
|
-
target: param1,
|
|
159
|
-
property: Identifier.create({
|
|
160
|
-
value: relation.relation.fkColumn.columnName
|
|
161
|
-
})
|
|
162
|
-
});
|
|
163
|
-
const join = Expression.logicalAnd(Expression.equal(targetKey, relatedKey), body.body);
|
|
164
|
-
let where = select.where;
|
|
165
|
-
if (where) {
|
|
166
|
-
where = BinaryExpression.create({
|
|
167
|
-
left: select.where,
|
|
168
|
-
operator: "AND",
|
|
169
|
-
right: join
|
|
170
|
-
});
|
|
171
|
-
}
|
|
172
|
-
else {
|
|
173
|
-
where = join;
|
|
174
|
-
}
|
|
175
|
-
select.where = where;
|
|
176
|
-
const exists = ExistsExpression.create({
|
|
177
|
-
target: select
|
|
178
|
-
});
|
|
179
|
-
const r = this.visit(exists);
|
|
180
|
-
this.scope.delete(param1);
|
|
181
|
-
this.scope.delete(select.sourceParameter);
|
|
182
|
-
return r;
|
|
130
|
+
return this.expandSome(body, relation, e, parameter, targetType);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (/^(map|select)$/i.test(chain[1])) {
|
|
134
|
+
const body = e.arguments[0];
|
|
135
|
+
if (body.type === "ArrowFunctionExpression") {
|
|
136
|
+
return this.expandMap(body, relation, e, parameter, targetType);
|
|
183
137
|
}
|
|
184
138
|
}
|
|
185
139
|
}
|
|
@@ -195,6 +149,113 @@ export default class ExpressionToSql extends Visitor {
|
|
|
195
149
|
const args = this.visitArray(e.arguments);
|
|
196
150
|
return prepare `${this.visit(e.callee)}(${args})`;
|
|
197
151
|
}
|
|
152
|
+
expandMap(body, relation, e, parameter, targetType) {
|
|
153
|
+
const param1 = body.params[0];
|
|
154
|
+
const relatedModel = relation.relation.relatedEntity;
|
|
155
|
+
const relatedType = relatedModel.typeClass;
|
|
156
|
+
let select;
|
|
157
|
+
if (this.source?.context) {
|
|
158
|
+
const query = FilteredExpression.isFiltered(e)
|
|
159
|
+
? this.source.context.query(relatedType)
|
|
160
|
+
: this.source.context.filteredQuery(relatedType, "include", false);
|
|
161
|
+
select = { ...query.selectStatement };
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
select = relatedModel.selectOneNumber();
|
|
165
|
+
}
|
|
166
|
+
param1.model = relatedModel;
|
|
167
|
+
this.scope.create({ parameter: param1, model: relatedModel, selectStatement: select });
|
|
168
|
+
this.scope.alias(param1, select.sourceParameter, select);
|
|
169
|
+
select.sourceParameter = param1;
|
|
170
|
+
select[filteredSymbol] = true;
|
|
171
|
+
const targetKey = MemberExpression.create({
|
|
172
|
+
target: parameter,
|
|
173
|
+
property: Identifier.create({
|
|
174
|
+
value: targetType.keys[0].columnName
|
|
175
|
+
})
|
|
176
|
+
});
|
|
177
|
+
const relatedKey = MemberExpression.create({
|
|
178
|
+
target: param1,
|
|
179
|
+
property: Identifier.create({
|
|
180
|
+
value: relation.relation.fkColumn.columnName
|
|
181
|
+
})
|
|
182
|
+
});
|
|
183
|
+
const join = Expression.equal(targetKey, relatedKey);
|
|
184
|
+
let where = select.where;
|
|
185
|
+
if (where) {
|
|
186
|
+
where = BinaryExpression.create({
|
|
187
|
+
left: select.where,
|
|
188
|
+
operator: "AND",
|
|
189
|
+
right: join
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
where = join;
|
|
194
|
+
}
|
|
195
|
+
select.where = where;
|
|
196
|
+
const exists = ExistsExpression.create({
|
|
197
|
+
target: select
|
|
198
|
+
});
|
|
199
|
+
const r = this.visit(exists);
|
|
200
|
+
this.scope.delete(param1);
|
|
201
|
+
this.scope.delete(select.sourceParameter);
|
|
202
|
+
return r;
|
|
203
|
+
}
|
|
204
|
+
expandSome(body, relation, e, parameter, targetType) {
|
|
205
|
+
const param1 = body.params[0];
|
|
206
|
+
const relatedModel = relation.relation.relatedEntity;
|
|
207
|
+
const relatedType = relatedModel.typeClass;
|
|
208
|
+
let select;
|
|
209
|
+
if (this.source?.context) {
|
|
210
|
+
const query = FilteredExpression.isFiltered(e)
|
|
211
|
+
? this.source.context.query(relatedType)
|
|
212
|
+
: this.source.context.filteredQuery(relatedType, "include", false);
|
|
213
|
+
select = { ...query.selectStatement };
|
|
214
|
+
select.fields = [
|
|
215
|
+
NumberLiteral.create({ value: 1 })
|
|
216
|
+
];
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
select = relatedModel.selectOneNumber();
|
|
220
|
+
}
|
|
221
|
+
param1.model = relatedModel;
|
|
222
|
+
this.scope.create({ parameter: param1, model: relatedModel, selectStatement: select });
|
|
223
|
+
this.scope.alias(param1, select.sourceParameter, select);
|
|
224
|
+
select.sourceParameter = param1;
|
|
225
|
+
select[filteredSymbol] = true;
|
|
226
|
+
const targetKey = MemberExpression.create({
|
|
227
|
+
target: parameter,
|
|
228
|
+
property: Identifier.create({
|
|
229
|
+
value: targetType.keys[0].columnName
|
|
230
|
+
})
|
|
231
|
+
});
|
|
232
|
+
const relatedKey = MemberExpression.create({
|
|
233
|
+
target: param1,
|
|
234
|
+
property: Identifier.create({
|
|
235
|
+
value: relation.relation.fkColumn.columnName
|
|
236
|
+
})
|
|
237
|
+
});
|
|
238
|
+
const join = Expression.logicalAnd(Expression.equal(targetKey, relatedKey), body.body);
|
|
239
|
+
let where = select.where;
|
|
240
|
+
if (where) {
|
|
241
|
+
where = BinaryExpression.create({
|
|
242
|
+
left: select.where,
|
|
243
|
+
operator: "AND",
|
|
244
|
+
right: join
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
else {
|
|
248
|
+
where = join;
|
|
249
|
+
}
|
|
250
|
+
select.where = where;
|
|
251
|
+
const exists = ExistsExpression.create({
|
|
252
|
+
target: select
|
|
253
|
+
});
|
|
254
|
+
const r = this.visit(exists);
|
|
255
|
+
this.scope.delete(param1);
|
|
256
|
+
this.scope.delete(select.sourceParameter);
|
|
257
|
+
return r;
|
|
258
|
+
}
|
|
198
259
|
visitIdentifier(e) {
|
|
199
260
|
// need to visit parameters
|
|
200
261
|
return [e.value];
|