@entity-access/entity-access 1.0.55 → 1.0.57
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/NamingConventions.d.ts +8 -0
- package/dist/compiler/NamingConventions.d.ts.map +1 -0
- package/dist/compiler/NamingConventions.js +8 -0
- package/dist/compiler/NamingConventions.js.map +1 -0
- package/dist/compiler/QueryCompiler.d.ts +2 -2
- package/dist/compiler/QueryCompiler.d.ts.map +1 -1
- package/dist/compiler/QueryCompiler.js +8 -3
- package/dist/compiler/QueryCompiler.js.map +1 -1
- package/dist/decorators/Column.d.ts.map +1 -1
- package/dist/decorators/Column.js +3 -0
- package/dist/decorators/Column.js.map +1 -1
- package/dist/decorators/IColumn.d.ts +5 -0
- package/dist/decorators/IColumn.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.d.ts.map +1 -1
- package/dist/drivers/base/BaseDriver.js +7 -7
- package/dist/drivers/base/BaseDriver.js.map +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js +1 -1
- package/dist/drivers/postgres/PostgreSqlDriver.js.map +1 -1
- package/dist/drivers/sql-server/ExpressionToSqlServer.d.ts.map +1 -1
- package/dist/drivers/sql-server/ExpressionToSqlServer.js +2 -2
- package/dist/drivers/sql-server/ExpressionToSqlServer.js.map +1 -1
- package/dist/drivers/sql-server/SqlServerQueryCompiler.d.ts +1 -1
- package/dist/drivers/sql-server/SqlServerQueryCompiler.d.ts.map +1 -1
- package/dist/drivers/sql-server/SqlServerQueryCompiler.js +6 -2
- package/dist/drivers/sql-server/SqlServerQueryCompiler.js.map +1 -1
- package/dist/entity-query/EntityType.d.ts +8 -5
- package/dist/entity-query/EntityType.d.ts.map +1 -1
- package/dist/entity-query/EntityType.js +31 -14
- package/dist/entity-query/EntityType.js.map +1 -1
- package/dist/eternity/EternityStorage.d.ts +1 -1
- package/dist/eternity/EternityStorage.d.ts.map +1 -1
- package/dist/eternity/EternityStorage.js +4 -4
- package/dist/eternity/EternityStorage.js.map +1 -1
- package/dist/migrations/Migrations.d.ts.map +1 -1
- package/dist/migrations/Migrations.js +5 -4
- package/dist/migrations/Migrations.js.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.d.ts.map +1 -1
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js +17 -14
- package/dist/migrations/postgres/PostgresAutomaticMigrations.js.map +1 -1
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js +12 -12
- package/dist/migrations/sql-server/SqlServerAutomaticMigrations.js.map +1 -1
- package/dist/model/EntityContext.js.map +1 -1
- package/dist/model/EntityModel.d.ts +4 -1
- package/dist/model/EntityModel.d.ts.map +1 -1
- package/dist/model/EntityModel.js +36 -5
- package/dist/model/EntityModel.js.map +1 -1
- package/dist/model/EntityQuery.d.ts.map +1 -1
- package/dist/model/EntityQuery.js +7 -7
- package/dist/model/EntityQuery.js.map +1 -1
- package/dist/model/SourceExpression.d.ts.map +1 -1
- package/dist/model/SourceExpression.js +3 -4
- package/dist/model/SourceExpression.js.map +1 -1
- package/dist/model/changes/ChangeEntry.js +2 -2
- package/dist/model/changes/ChangeEntry.js.map +1 -1
- package/dist/model/changes/ChangeSet.js +1 -2
- package/dist/model/changes/ChangeSet.js.map +1 -1
- package/dist/model/verification/VerificationSession.d.ts.map +1 -1
- package/dist/model/verification/VerificationSession.js +6 -6
- package/dist/model/verification/VerificationSession.js.map +1 -1
- package/dist/query/ast/DebugStringVisitor.d.ts +1 -2
- package/dist/query/ast/DebugStringVisitor.d.ts.map +1 -1
- package/dist/query/ast/DebugStringVisitor.js +0 -3
- package/dist/query/ast/DebugStringVisitor.js.map +1 -1
- package/dist/query/ast/ExpressionToSql.d.ts +1 -2
- package/dist/query/ast/ExpressionToSql.d.ts.map +1 -1
- package/dist/query/ast/ExpressionToSql.js +16 -14
- package/dist/query/ast/ExpressionToSql.js.map +1 -1
- package/dist/query/ast/Expressions.d.ts +15 -20
- package/dist/query/ast/Expressions.d.ts.map +1 -1
- package/dist/query/ast/Expressions.js +17 -19
- package/dist/query/ast/Expressions.js.map +1 -1
- package/dist/query/ast/IStringTransformer.d.ts +2 -3
- package/dist/query/ast/IStringTransformer.d.ts.map +1 -1
- package/dist/query/ast/IStringTransformer.js +4 -6
- package/dist/query/ast/IStringTransformer.js.map +1 -1
- package/dist/query/ast/Visitor.d.ts +1 -2
- package/dist/query/ast/Visitor.d.ts.map +1 -1
- package/dist/query/ast/Visitor.js +0 -5
- package/dist/query/ast/Visitor.js.map +1 -1
- package/dist/query/expander/QueryExpander.js +2 -2
- package/dist/query/expander/QueryExpander.js.map +1 -1
- package/dist/query/parser/ArrowToExpression.d.ts.map +1 -1
- package/dist/query/parser/ArrowToExpression.js +2 -2
- package/dist/query/parser/ArrowToExpression.js.map +1 -1
- package/dist/tests/eternity/eternity-tests.d.ts.map +1 -1
- package/dist/tests/eternity/eternity-tests.js +1 -1
- package/dist/tests/eternity/eternity-tests.js.map +1 -1
- package/dist/tests/expressions/left-joins/child-joins.js +41 -41
- package/dist/tests/expressions/left-joins/child-joins.js.map +1 -1
- package/dist/tests/expressions/select/select.d.ts.map +1 -1
- package/dist/tests/expressions/select/select.js +2 -2
- package/dist/tests/expressions/select/select.js.map +1 -1
- package/dist/tests/expressions/simple/parse-arrow.js +10 -10
- package/dist/tests/expressions/simple/parse-arrow.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/compiler/NamingConventions.ts +7 -0
- package/src/compiler/QueryCompiler.ts +7 -5
- package/src/decorators/Column.ts +3 -0
- package/src/decorators/IColumn.ts +7 -0
- package/src/drivers/base/BaseDriver.ts +9 -9
- package/src/drivers/postgres/PostgreSqlDriver.ts +1 -1
- package/src/drivers/sql-server/ExpressionToSqlServer.ts +2 -2
- package/src/drivers/sql-server/SqlServerQueryCompiler.ts +5 -2
- package/src/entity-query/EntityType.ts +35 -13
- package/src/eternity/EternityStorage.ts +3 -3
- package/src/migrations/Migrations.ts +5 -3
- package/src/migrations/postgres/PostgresAutomaticMigrations.ts +17 -14
- package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts +12 -12
- package/src/model/EntityContext.ts +1 -1
- package/src/model/EntityModel.ts +41 -7
- package/src/model/EntityQuery.ts +7 -7
- package/src/model/SourceExpression.ts +3 -4
- package/src/model/changes/ChangeEntry.ts +2 -2
- package/src/model/changes/ChangeSet.ts +1 -1
- package/src/model/verification/VerificationSession.ts +6 -7
- package/src/query/ast/DebugStringVisitor.ts +1 -5
- package/src/query/ast/ExpressionToSql.ts +18 -15
- package/src/query/ast/Expressions.ts +33 -34
- package/src/query/ast/IStringTransformer.ts +4 -4
- package/src/query/ast/Visitor.ts +1 -7
- package/src/query/expander/QueryExpander.ts +4 -4
- package/src/query/parser/ArrowToExpression.ts +2 -2
- package/src/tests/eternity/eternity-tests.ts +2 -1
- package/src/tests/expressions/left-joins/child-joins.ts +41 -41
- package/src/tests/expressions/select/select.ts +2 -5
- package/src/tests/expressions/simple/parse-arrow.ts +10 -10
- package/test.js +21 -21
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare const NamingConventions: {
|
|
2
|
+
snakeCase: (text: string) => string;
|
|
3
|
+
snakeCaseCapital: (text: string) => string;
|
|
4
|
+
lowerCase: (text: string) => string;
|
|
5
|
+
upperCase: (text: string) => string;
|
|
6
|
+
pascalCase: (text: string) => string;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=NamingConventions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NamingConventions.d.ts","sourceRoot":"","sources":["../../src/compiler/NamingConventions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB;sBACR,MAAM;6BACC,MAAM;sBACb,MAAM;sBACN,MAAM;uBACL,MAAM;CAC5B,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export const NamingConventions = {
|
|
2
|
+
snakeCase: (text) => text.replace(/[A-Z]+/g, (letter, index) => index === 0 ? letter.toLowerCase() : '_' + letter.toLowerCase()),
|
|
3
|
+
snakeCaseCapital: (text) => text.replace(/[A-Z]+/g, (letter, index) => index === 0 ? letter.toUpperCase() : '_' + letter.toUpperCase()),
|
|
4
|
+
lowerCase: (text) => text.toLowerCase(),
|
|
5
|
+
upperCase: (text) => text.toUpperCase(),
|
|
6
|
+
pascalCase: (text) => text[0].toUpperCase() + text.substring(1)
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=NamingConventions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NamingConventions.js","sourceRoot":"","sources":["../../src/compiler/NamingConventions.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,GAAE,MAAM,CAAC,WAAW,EAAE,CAAC;IACvI,gBAAgB,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,GAAE,MAAM,CAAC,WAAW,EAAE,CAAC;IAC9I,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;IAC/C,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;IAC/C,UAAU,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;CAC1E,CAAC"}
|
|
@@ -13,10 +13,10 @@ export default class QueryCompiler {
|
|
|
13
13
|
static instance: QueryCompiler;
|
|
14
14
|
readonly arrowToExpression: typeof ArrowToExpression;
|
|
15
15
|
readonly expressionToSql: typeof ExpressionToSql;
|
|
16
|
-
readonly
|
|
16
|
+
readonly namingConvention: IStringTransformer;
|
|
17
17
|
readonly escapeLiteral: IStringTransformer;
|
|
18
18
|
readonly sqlMethodTransformer: ISqlMethodTransformer;
|
|
19
|
-
constructor({ arrowToExpression, expressionToSql,
|
|
19
|
+
constructor({ arrowToExpression, expressionToSql, namingConvention, escapeLiteral, sqlMethodTransformer }?: Partial<QueryCompiler>);
|
|
20
20
|
execute<P = any, T = any>(parameters: P, fx: (p: P) => (x: T) => any, source?: EntityQuery): {
|
|
21
21
|
text: string;
|
|
22
22
|
values: any[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCompiler.d.ts","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAmB,MAAM,6BAA6B,CAAC;AAE/F,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAErE,OAAO,WAAW,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryCompiler.d.ts","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAmB,MAAM,6BAA6B,CAAC;AAE/F,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAErE,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAGlD,qBAAa,aAAa;IAEX,IAAI,EAAE,mBAAmB;IACzB,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,UAAU;gBAFrB,IAAI,EAAE,mBAAmB,EACzB,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,UAAU;CACnC;AAED,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,OAAc,QAAQ,gBAAuB;IAE7C,SAAgB,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5D,SAAgB,eAAe,EAAE,OAAO,eAAe,CAAC;IAGxD,SAAgB,gBAAgB,EAAE,kBAAkB,CAAC;IACrD,SAAgB,aAAa,EAAE,kBAAkB,CAAC;IAElD,SAAgB,oBAAoB,EAAE,qBAAqB,CAAC;gBAGxD,EACI,iBAAqC,EACrC,eAAiC,EACjC,gBAA8C,EAE9C,aAAwC,EACxC,oBAAkD,EACrD,GAAE,OAAO,CAAC,aAAa,CAAM;IAU3B,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,GAAG,EAAE,MAAM,CAAC,EAAE,WAAW;;;;IAO1F,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC,KAAA,KAAK,CAAC,CAAC,KAAA,KAAK,GAAG;;;;;IAKlD,YAAY,CAAE,MAAM,EAAE,WAAW,EAAG,EAAE,EAAE,CAAC,CAAC,KAAA,KAAK,CAAC,CAAC,KAAA,KAAK,GAAG;IAOzD,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU;;;;IAM7D,OAAO,CAAC,MAAM;CAejB"}
|
|
@@ -2,6 +2,7 @@ import ExpressionToSql from "../query/ast/ExpressionToSql.js";
|
|
|
2
2
|
import SqlLiteral from "../query/ast/SqlLiteral.js";
|
|
3
3
|
import ArrowToExpression from "../query/parser/ArrowToExpression.js";
|
|
4
4
|
import PostgreSqlMethodTransformer from "./postgres/PostgreSqlMethodTransformer.js";
|
|
5
|
+
import { NamingConventions } from "./NamingConventions.js";
|
|
5
6
|
export class CompiledQuery {
|
|
6
7
|
root;
|
|
7
8
|
target;
|
|
@@ -16,14 +17,18 @@ export default class QueryCompiler {
|
|
|
16
17
|
static instance = new QueryCompiler();
|
|
17
18
|
arrowToExpression;
|
|
18
19
|
expressionToSql;
|
|
19
|
-
quotedLiteral;
|
|
20
|
+
// public readonly quotedLiteral: IStringTransformer;
|
|
21
|
+
namingConvention;
|
|
20
22
|
escapeLiteral;
|
|
21
23
|
sqlMethodTransformer;
|
|
22
|
-
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSql,
|
|
24
|
+
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSql, namingConvention = NamingConventions.snakeCase,
|
|
25
|
+
// quotedLiteral = JSON.stringify,
|
|
26
|
+
escapeLiteral = SqlLiteral.escapeLiteral, sqlMethodTransformer = PostgreSqlMethodTransformer } = {}) {
|
|
23
27
|
this.arrowToExpression = arrowToExpression;
|
|
24
28
|
this.expressionToSql = expressionToSql;
|
|
25
29
|
this.escapeLiteral = escapeLiteral;
|
|
26
|
-
this.
|
|
30
|
+
this.namingConvention = namingConvention;
|
|
31
|
+
// this.quotedLiteral = quotedLiteral;
|
|
27
32
|
this.sqlMethodTransformer = sqlMethodTransformer;
|
|
28
33
|
}
|
|
29
34
|
execute(parameters, fx, source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryCompiler.js","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAG9D,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,2BAA2B,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryCompiler.js","sourceRoot":"","sources":["../../src/compiler/QueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,iCAAiC,CAAC;AAG9D,OAAO,UAAU,MAAM,4BAA4B,CAAC;AACpD,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,2BAA2B,MAAM,2CAA2C,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,OAAO,aAAa;IAEX;IACA;IACA;IAHX,YACW,IAAyB,EACzB,MAA2B,EAC3B,SAAqB;QAFrB,SAAI,GAAJ,IAAI,CAAqB;QACzB,WAAM,GAAN,MAAM,CAAqB;QAC3B,cAAS,GAAT,SAAS,CAAY;IAAG,CAAC;CACvC;AAED,MAAM,CAAC,OAAO,OAAO,aAAa;IAEvB,MAAM,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;IAE7B,iBAAiB,CAA2B;IAC5C,eAAe,CAAyB;IAExD,qDAAqD;IACrC,gBAAgB,CAAqB;IACrC,aAAa,CAAqB;IAElC,oBAAoB,CAAwB;IAE5D,YACI,EACI,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,eAAe,EACjC,gBAAgB,GAAG,iBAAiB,CAAC,SAAS;IAC9C,kCAAkC;IAClC,aAAa,GAAG,UAAU,CAAC,aAAa,EACxC,oBAAoB,GAAG,2BAA2B,KAC1B,EAAE;QAE9B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,sCAAsC;QACtC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAEM,OAAO,CAAmB,UAAa,EAAE,EAA2B,EAAE,MAAoB;QAC7F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAG,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAChH,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAEM,OAAO,CAAC,MAAmB,EAAE,EAAqB;QACrD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAG,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAChH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC;IAEM,YAAY,CAAE,MAAmB,EAAG,EAAqB;QAC5D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAG,IAAI,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;QAChH,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,EAAC,GAAG,CAAC,MAAM,EAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAEM,iBAAiB,CAAC,MAAmB,EAAE,GAAe;QACzD,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,IAAI,EAAE,IAAI,EAAG,GAAuB,EAAE,eAAe,IAAI,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QAC1J,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEO,MAAM,CAAC,KAAiB,EAAE,IAAS,EAAE;QACzC,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE;YAC1B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAChC,IAAI,IAAI,QAAQ,CAAC;gBACjB,SAAS;aACZ;YACD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,IAAI,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;SAC/B;QACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../../src/decorators/Column.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIvC,OAAO,kBAAkB,CAAC;AAG1B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,GAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,CAAM,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../../src/decorators/Column.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIvC,OAAO,kBAAkB,CAAC;AAG1B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,GAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,CAAM,GAAG,GAAG,CA2BjF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../src/decorators/Column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,OAAO,kBAAkB,CAAC;AAE1B,CAAC;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAA2C,EAAE;IACxE,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,KAAK,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9C,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;YACjB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;gBAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;aAClB;SACJ;QACD,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC;QACrB,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;QACb,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC;QACrB,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC,CAAC,IAAI,GAAI,OAAe,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,EAAE;YACvB,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;SACpC;QAGD,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU,EAAE,MAAW;IACrC,QAAO,MAAM,EAAE;QACX,KAAK,MAAM;YACP,OAAO,MAAM,CAAC;QAClB,KAAK,MAAM;YACP,IAAI,CAAC,CAAC,GAAG,EAAE;gBACP,OAAO,QAAQ,CAAC;aACnB;YACD,OAAO,QAAQ,CAAC;QACpB,KAAK,MAAM;YACP,OAAO,QAAQ,CAAC;QACpB,KAAK,IAAI,CAAC;QACV,KAAK,QAAQ;YACT,OAAO,gBAAgB,CAAC;QAC5B,KAAK,OAAO;YACR,OAAO,SAAS,CAAC;KACxB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
1
|
+
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../src/decorators/Column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,OAAO,kBAAkB,CAAC;AAE1B,CAAC;AACD,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAA2C,EAAE;IACxE,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;QACxC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,KAAK,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9C,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;YACjB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;gBAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;aAClB;SACJ;QACD,IAAI,GAAG,CAAC,UAAU,EAAE;YAChB,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;SAC3B;QACD,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC;QACrB,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;QACb,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC;QACrB,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC,CAAC,IAAI,GAAI,OAAe,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,EAAE;YACvB,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;SACpC;QAGD,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,QAAQ,CAAC,CAAU,EAAE,MAAW;IACrC,QAAO,MAAM,EAAE;QACX,KAAK,MAAM;YACP,OAAO,MAAM,CAAC;QAClB,KAAK,MAAM;YACP,IAAI,CAAC,CAAC,GAAG,EAAE;gBACP,OAAO,QAAQ,CAAC;aACnB;YACD,OAAO,QAAQ,CAAC;QACpB,KAAK,MAAM;YACP,OAAO,QAAQ,CAAC;QACpB,KAAK,IAAI,CAAC;QACV,KAAK,QAAQ;YACT,OAAO,gBAAgB,CAAC;QAC5B,KAAK,OAAO;YACR,OAAO,SAAS,CAAC;KACxB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -4,6 +4,11 @@ import { ISqlType } from "./ISqlType.js";
|
|
|
4
4
|
export interface IColumn {
|
|
5
5
|
name?: string;
|
|
6
6
|
columnName?: string;
|
|
7
|
+
explicitName?: boolean;
|
|
8
|
+
/**
|
|
9
|
+
* This will be used to retrieve data from provider.
|
|
10
|
+
*/
|
|
11
|
+
formattedName?: string;
|
|
7
12
|
order?: number;
|
|
8
13
|
key?: boolean;
|
|
9
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IColumn.d.ts","sourceRoot":"","sources":["../../src/decorators/IColumn.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAE5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;IAGvB,UAAU,EAAE,MAAM,CAAC;IAEnB,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEhC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAE/B"}
|
|
1
|
+
{"version":3,"file":"IColumn.d.ts","sourceRoot":"","sources":["../../src/decorators/IColumn.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,WAAW,OAAO;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAE5B,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,YAAY,CAAC,EAAE,OAAO,CAAC;IAGvB,UAAU,EAAE,MAAM,CAAC;IAEnB,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IAEhC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAGnB,WAAW,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAE/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":";;AACA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,WAAW,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAA8B,eAAe,
|
|
1
|
+
{"version":3,"file":"BaseDriver.d.ts","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":";;AACA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,UAAU,MAAM,kCAAkC,CAAC;AAC1D,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,WAAW,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAA8B,eAAe,EAA4C,eAAe,EAA6E,eAAe,EAAmB,MAAM,gCAAgC,CAAC;AAErQ,eAAO,MAAM,gBAAgB,EAAE,OAAO,MAAyD,CAAC;AAEhG,UAAU,WAAW;IACjB,CAAC,gBAAgB,CAAC,CAAC,IAAI,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,OAAO;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,SAAU,SAAQ,WAAW;IAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5E,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,OAAO,SAAU,MAAM;UAAW,MAAM;aAAW,GAAG,EAAE;CAE3D,CAAC;AAEX,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACzB,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3B;AAED,8BAAsB,UAAU;aAKA,gBAAgB,EAAE,mBAAmB;IAJjE,QAAQ,KAAK,QAAQ,IAAI,aAAa,CAAC;IAEvC,OAAO,CAAC,kBAAkB,CAAmB;gBAEjB,gBAAgB,EAAE,mBAAmB;aAEjD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC;aAExE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;aAE1E,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;aAE9B,iBAAiB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAEjD,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IAuB5D;;;OAGG;aACa,mBAAmB,IAAI,UAAU;IAEjD,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,eAAe;IAkCtE,sBAAsB,CAAC,KAAK,EAAE,WAAW;IA+BzC,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG;CA0BvD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BinaryExpression, Constant, DeleteStatement,
|
|
1
|
+
import { BinaryExpression, Constant, DeleteStatement, Expression, Identifier, InsertStatement, ReturnUpdated, TableLiteral, UpdateStatement, ValuesStatement } from "../../query/ast/Expressions.js";
|
|
2
2
|
export const disposableSymbol = Symbol.dispose ??= Symbol("disposable");
|
|
3
3
|
export const toQuery = (text) => typeof text === "string"
|
|
4
4
|
? { text, values: [] }
|
|
@@ -37,7 +37,7 @@ export class BaseDriver {
|
|
|
37
37
|
const fields = [];
|
|
38
38
|
const values = [];
|
|
39
39
|
for (const iterator of type.columns) {
|
|
40
|
-
const literal =
|
|
40
|
+
const literal = Identifier.create({ value: iterator.columnName });
|
|
41
41
|
if (iterator.autoGenerate) {
|
|
42
42
|
returnFields.push(literal);
|
|
43
43
|
continue;
|
|
@@ -49,8 +49,8 @@ export class BaseDriver {
|
|
|
49
49
|
fields.push(literal);
|
|
50
50
|
values.push(Constant.create({ value }));
|
|
51
51
|
}
|
|
52
|
-
const name =
|
|
53
|
-
const schema = type.schema ?
|
|
52
|
+
const name = Expression.identifier(type.name);
|
|
53
|
+
const schema = type.schema ? Expression.identifier(type.schema) : void 0;
|
|
54
54
|
return InsertStatement.create({
|
|
55
55
|
table: TableLiteral.create({
|
|
56
56
|
name,
|
|
@@ -67,7 +67,7 @@ export class BaseDriver {
|
|
|
67
67
|
const set = [];
|
|
68
68
|
for (const [key, change] of entry.modified) {
|
|
69
69
|
set.push(BinaryExpression.create({
|
|
70
|
-
left:
|
|
70
|
+
left: Expression.identifier(key.columnName),
|
|
71
71
|
operator: "=",
|
|
72
72
|
right: Constant.create({ value: change.newValue ?? null })
|
|
73
73
|
}));
|
|
@@ -75,7 +75,7 @@ export class BaseDriver {
|
|
|
75
75
|
let where = null;
|
|
76
76
|
for (const iterator of entry.type.keys) {
|
|
77
77
|
const compare = BinaryExpression.create({
|
|
78
|
-
left:
|
|
78
|
+
left: Expression.identifier(iterator.columnName),
|
|
79
79
|
operator: "=",
|
|
80
80
|
right: Constant.create({ value: entry.entity[iterator.name] })
|
|
81
81
|
});
|
|
@@ -101,7 +101,7 @@ export class BaseDriver {
|
|
|
101
101
|
return null;
|
|
102
102
|
}
|
|
103
103
|
const compare = BinaryExpression.create({
|
|
104
|
-
left:
|
|
104
|
+
left: Expression.identifier(iterator.columnName),
|
|
105
105
|
operator: "=",
|
|
106
106
|
right: Constant.create({ value: key })
|
|
107
107
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"BaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/base/BaseDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,7 @@ export default class PostgreSqlDriver extends BaseDriver {
|
|
|
100
100
|
if (r.rowCount === 1) {
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
|
-
await connection.query(
|
|
103
|
+
await connection.query(`CREATE DATABASE "${db}"`);
|
|
104
104
|
}
|
|
105
105
|
finally {
|
|
106
106
|
await connection.end();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreSqlDriver.js","sourceRoot":"","sources":["../../../src/drivers/postgres/PostgreSqlDriver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PostgreSqlDriver.js","sourceRoot":"","sources":["../../../src/drivers/postgres/PostgreSqlDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionToSqlServer.d.ts","sourceRoot":"","sources":["../../../src/drivers/sql-server/ExpressionToSqlServer.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"ExpressionToSqlServer.d.ts","sourceRoot":"","sources":["../../../src/drivers/sql-server/ExpressionToSqlServer.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAoC,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACpK,OAAO,EAAE,UAAU,EAAW,MAAM,uCAAuC,CAAC;AAE5E,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,eAAe;IAE9D,kBAAkB,CAAC,CAAC,EAAE,aAAa,GAAG,UAAU;IAkBhD,oBAAoB,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU;IAuBpD,oBAAoB,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU;IA8CpD,oBAAoB,CAAC,CAAC,EAAE,eAAe,GAAG,UAAU;IAUpD,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,cAAc,GAAG,UAAU;CAG7D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import ExpressionToSql from "../../query/ast/ExpressionToSql.js";
|
|
2
|
-
import {
|
|
2
|
+
import { NumberLiteral, OrderByExpression, ValuesStatement } from "../../query/ast/Expressions.js";
|
|
3
3
|
import { prepare } from "../../query/ast/IStringTransformer.js";
|
|
4
4
|
export default class ExpressionToSqlServer extends ExpressionToSql {
|
|
5
5
|
visitReturnUpdated(e) {
|
|
@@ -50,7 +50,7 @@ export default class ExpressionToSqlServer extends ExpressionToSql {
|
|
|
50
50
|
// lets set default order by... if not set...
|
|
51
51
|
// as sql server needs something to order by...
|
|
52
52
|
e.orderBy = [
|
|
53
|
-
OrderByExpression.create({ target:
|
|
53
|
+
OrderByExpression.create({ target: NumberLiteral.one })
|
|
54
54
|
];
|
|
55
55
|
}
|
|
56
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressionToSqlServer.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/ExpressionToSqlServer.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"ExpressionToSqlServer.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/ExpressionToSqlServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import QueryCompiler from "../../compiler/QueryCompiler.js";
|
|
2
2
|
export default class SqlServerQueryCompiler extends QueryCompiler {
|
|
3
|
-
constructor({ arrowToExpression, expressionToSql,
|
|
3
|
+
constructor({ arrowToExpression, expressionToSql, namingConvention, escapeLiteral, sqlMethodTransformer }?: Partial<QueryCompiler>);
|
|
4
4
|
}
|
|
5
5
|
//# sourceMappingURL=SqlServerQueryCompiler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerQueryCompiler.d.ts","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SqlServerQueryCompiler.d.ts","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAM5D,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;gBAEjD,EACR,iBAAqC,EACrC,eAAuC,EAEvC,gBAA+C,EAC/C,aAA8C,EAC9C,oBAAoD,EACvD,GAAE,OAAO,CAAC,aAAa,CAAM;CAWjC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
+
import { NamingConventions } from "../../compiler/NamingConventions.js";
|
|
1
2
|
import QueryCompiler from "../../compiler/QueryCompiler.js";
|
|
2
3
|
import SqlServerSqlMethodTransformer from "../../compiler/sql-server/SqlServerSqlMethodTransformer.js";
|
|
3
4
|
import ArrowToExpression from "../../query/parser/ArrowToExpression.js";
|
|
4
5
|
import ExpressionToSqlServer from "./ExpressionToSqlServer.js";
|
|
5
6
|
import { SqlServerLiteral } from "./SqlServerLiteral.js";
|
|
6
7
|
export default class SqlServerQueryCompiler extends QueryCompiler {
|
|
7
|
-
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSqlServer,
|
|
8
|
+
constructor({ arrowToExpression = ArrowToExpression, expressionToSql = ExpressionToSqlServer,
|
|
9
|
+
// quotedLiteral = SqlServerLiteral.quotedLiteral,
|
|
10
|
+
namingConvention = NamingConventions.pascalCase, escapeLiteral = SqlServerLiteral.escapeLiteral, sqlMethodTransformer = SqlServerSqlMethodTransformer } = {}) {
|
|
8
11
|
super({
|
|
9
12
|
arrowToExpression,
|
|
10
13
|
expressionToSql,
|
|
11
|
-
|
|
14
|
+
namingConvention,
|
|
15
|
+
// quotedLiteral,
|
|
12
16
|
escapeLiteral,
|
|
13
17
|
sqlMethodTransformer
|
|
14
18
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlServerQueryCompiler.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,6BAA6B,MAAM,4DAA4D,CAAC;AACvG,OAAO,iBAAiB,MAAM,yCAAyC,CAAC;AACxE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;IAE7D,YAAY,EACR,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,qBAAqB,
|
|
1
|
+
{"version":3,"file":"SqlServerQueryCompiler.js","sourceRoot":"","sources":["../../../src/drivers/sql-server/SqlServerQueryCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,6BAA6B,MAAM,4DAA4D,CAAC;AACvG,OAAO,iBAAiB,MAAM,yCAAyC,CAAC;AACxE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,aAAa;IAE7D,YAAY,EACR,iBAAiB,GAAG,iBAAiB,EACrC,eAAe,GAAG,qBAAqB;IACvC,kDAAkD;IAClD,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,EAC/C,aAAa,GAAG,gBAAgB,CAAC,aAAa,EAC9C,oBAAoB,GAAG,6BAA6B,KAC5B,EAAE;QAC1B,KAAK,CAAC;YACF,iBAAiB;YACjB,eAAe;YACf,gBAAgB;YAChB,iBAAiB;YACjB,aAAa;YACb,oBAAoB;SACvB,CAAC,CAAC;IACP,CAAC;CAEJ"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { IColumn, IEntityRelation } from "../decorators/IColumn.js";
|
|
2
2
|
import { IClassOf } from "../decorators/IClassOf.js";
|
|
3
|
-
import { Expression, ExpressionAs,
|
|
3
|
+
import { Expression, ExpressionAs, SelectStatement, TableLiteral } from "../query/ast/Expressions.js";
|
|
4
4
|
import { IIndex } from "../decorators/IIndex.js";
|
|
5
|
+
import { IStringTransformer } from "../query/ast/IStringTransformer.js";
|
|
5
6
|
export declare const addOrCreateColumnSymbol: unique symbol;
|
|
6
7
|
export declare const addColumnSymbol: unique symbol;
|
|
7
8
|
/**
|
|
@@ -17,12 +18,13 @@ export default class EntityType {
|
|
|
17
18
|
readonly indexes: IIndex[];
|
|
18
19
|
readonly keys: IColumn[];
|
|
19
20
|
readonly nonKeys: IColumn[];
|
|
20
|
-
get fullyQualifiedName():
|
|
21
|
+
get fullyQualifiedName(): TableLiteral | import("../query/ast/Expressions.js").Identifier;
|
|
21
22
|
private fieldMap;
|
|
22
23
|
private columnMap;
|
|
23
24
|
private relationMap;
|
|
24
25
|
private selectAll;
|
|
25
26
|
private selectOne;
|
|
27
|
+
constructor(original?: EntityType, namingConvention?: IStringTransformer);
|
|
26
28
|
[addOrCreateColumnSymbol](name: string): IColumn;
|
|
27
29
|
getProperty(name: string): {
|
|
28
30
|
field: IColumn;
|
|
@@ -31,12 +33,12 @@ export default class EntityType {
|
|
|
31
33
|
addColumn(c: IColumn): void;
|
|
32
34
|
getColumn(name: string): IColumn;
|
|
33
35
|
getField(name: string): IColumn;
|
|
34
|
-
addRelation(relation: IEntityRelation): IEntityRelation;
|
|
36
|
+
addRelation(relation: IEntityRelation, getInverseModel?: (t: any) => EntityType): IEntityRelation;
|
|
35
37
|
selectAllFields(): {
|
|
36
38
|
type: "SelectStatement";
|
|
37
39
|
source: import("../query/ast/Expressions.js").ValuesStatement | import("../query/ast/Expressions.js").TableSource;
|
|
38
40
|
sourceParameter: import("../query/ast/Expressions.js").ParameterExpression;
|
|
39
|
-
fields: (Expression |
|
|
41
|
+
fields: (Expression | ExpressionAs | import("../query/ast/Expressions.js").Identifier)[];
|
|
40
42
|
where: Expression;
|
|
41
43
|
orderBy: import("../query/ast/Expressions.js").OrderByExpression[];
|
|
42
44
|
joins: import("../query/ast/Expressions.js").JoinExpression[];
|
|
@@ -49,7 +51,7 @@ export default class EntityType {
|
|
|
49
51
|
type: "SelectStatement";
|
|
50
52
|
source: import("../query/ast/Expressions.js").ValuesStatement | import("../query/ast/Expressions.js").TableSource;
|
|
51
53
|
sourceParameter: import("../query/ast/Expressions.js").ParameterExpression;
|
|
52
|
-
fields: (Expression |
|
|
54
|
+
fields: (Expression | ExpressionAs | import("../query/ast/Expressions.js").Identifier)[];
|
|
53
55
|
where: Expression;
|
|
54
56
|
orderBy: import("../query/ast/Expressions.js").OrderByExpression[];
|
|
55
57
|
joins: import("../query/ast/Expressions.js").JoinExpression[];
|
|
@@ -58,5 +60,6 @@ export default class EntityType {
|
|
|
58
60
|
model: EntityType;
|
|
59
61
|
include: SelectStatement[];
|
|
60
62
|
};
|
|
63
|
+
map(row: any): any;
|
|
61
64
|
}
|
|
62
65
|
//# sourceMappingURL=EntityType.d.ts.map
|
|
@@ -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,
|
|
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;AAG3D;;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;;;;IAMxB,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;;;;;;;;;;;;;IAgBf,eAAe;;;;;;;;;;;;;IAkBf,GAAG,CAAC,GAAG,EAAE,GAAG;CAWtB"}
|
|
@@ -7,8 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import
|
|
11
|
-
import { Expression, ExpressionAs, QuotedLiteral, SelectStatement, TableLiteral } from "../query/ast/Expressions.js";
|
|
10
|
+
import { Expression, NumberLiteral, SelectStatement, TableLiteral } from "../query/ast/Expressions.js";
|
|
12
11
|
import InstanceCache from "../common/cache/InstanceCache.js";
|
|
13
12
|
export const addOrCreateColumnSymbol = Symbol("addOrCreateColumn");
|
|
14
13
|
export const addColumnSymbol = Symbol("addOrCreateColumn");
|
|
@@ -28,16 +27,25 @@ export default class EntityType {
|
|
|
28
27
|
get fullyQualifiedName() {
|
|
29
28
|
return this.schema
|
|
30
29
|
? TableLiteral.create({
|
|
31
|
-
schema:
|
|
32
|
-
name:
|
|
30
|
+
schema: Expression.identifier(this.schema),
|
|
31
|
+
name: Expression.identifier(this.name)
|
|
33
32
|
})
|
|
34
|
-
:
|
|
33
|
+
: Expression.identifier(this.name);
|
|
35
34
|
}
|
|
36
35
|
fieldMap = new Map();
|
|
37
36
|
columnMap = new Map();
|
|
38
37
|
relationMap = new Map();
|
|
39
38
|
selectAll;
|
|
40
39
|
selectOne;
|
|
40
|
+
constructor(original, namingConvention) {
|
|
41
|
+
if (!original) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
this.typeClass = original.typeClass;
|
|
45
|
+
this.name = namingConvention ? namingConvention(original.name) : original.name;
|
|
46
|
+
this.schema = original.schema ? (namingConvention ? namingConvention(original.schema) : original.schema) : original.schema;
|
|
47
|
+
this.entityName = original.entityName;
|
|
48
|
+
}
|
|
41
49
|
[addOrCreateColumnSymbol](name) {
|
|
42
50
|
return this.fieldMap.get(name) ?? { name };
|
|
43
51
|
}
|
|
@@ -68,7 +76,7 @@ export default class EntityType {
|
|
|
68
76
|
getField(name) {
|
|
69
77
|
return this.fieldMap.get(name);
|
|
70
78
|
}
|
|
71
|
-
addRelation(relation) {
|
|
79
|
+
addRelation(relation, getInverseModel) {
|
|
72
80
|
// we will also set fk to the corresponding column
|
|
73
81
|
this.relations.push(relation);
|
|
74
82
|
this.relationMap.set(relation.name, relation);
|
|
@@ -88,8 +96,11 @@ export default class EntityType {
|
|
|
88
96
|
if (fkColumn.dataType === "Double") {
|
|
89
97
|
fkColumn.dataType = "BigInt";
|
|
90
98
|
}
|
|
99
|
+
if (!getInverseModel) {
|
|
100
|
+
return relation;
|
|
101
|
+
}
|
|
91
102
|
// let us set inverse relations...
|
|
92
|
-
const relatedType =
|
|
103
|
+
const relatedType = getInverseModel(relation.relatedTypeClass);
|
|
93
104
|
relation.relatedEntity = relatedType;
|
|
94
105
|
const inverseRelation = {
|
|
95
106
|
name: relation.relatedName,
|
|
@@ -115,12 +126,7 @@ export default class EntityType {
|
|
|
115
126
|
}
|
|
116
127
|
const source = this.fullyQualifiedName;
|
|
117
128
|
const as = Expression.parameter(this.name[0] + "1");
|
|
118
|
-
const fields = this.columns.map((c) =>
|
|
119
|
-
? ExpressionAs.create({
|
|
120
|
-
expression: Expression.member(as, c.columnName),
|
|
121
|
-
alias: QuotedLiteral.create({ literal: c.name })
|
|
122
|
-
})
|
|
123
|
-
: Expression.member(as, c.columnName));
|
|
129
|
+
const fields = this.columns.map((c) => Expression.member(as, c.columnName));
|
|
124
130
|
this.selectAll = SelectStatement.create({
|
|
125
131
|
source,
|
|
126
132
|
model: this,
|
|
@@ -136,7 +142,7 @@ export default class EntityType {
|
|
|
136
142
|
const source = this.fullyQualifiedName;
|
|
137
143
|
const as = Expression.parameter(this.name[0] + "1");
|
|
138
144
|
const fields = [
|
|
139
|
-
|
|
145
|
+
NumberLiteral.one
|
|
140
146
|
];
|
|
141
147
|
this.selectOne = SelectStatement.create({
|
|
142
148
|
source,
|
|
@@ -146,6 +152,17 @@ export default class EntityType {
|
|
|
146
152
|
});
|
|
147
153
|
return { ...this.selectOne };
|
|
148
154
|
}
|
|
155
|
+
map(row) {
|
|
156
|
+
const c = new this.typeClass();
|
|
157
|
+
for (const iterator of this.columns) {
|
|
158
|
+
const value = row[iterator.columnName];
|
|
159
|
+
if (value === void 0) {
|
|
160
|
+
continue;
|
|
161
|
+
}
|
|
162
|
+
c[iterator.name] = value;
|
|
163
|
+
}
|
|
164
|
+
return c;
|
|
165
|
+
}
|
|
149
166
|
}
|
|
150
167
|
__decorate([
|
|
151
168
|
InstanceCache,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"EntityType.js","sourceRoot":"","sources":["../../src/entity-query/EntityType.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EternityStorage.d.ts","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,qBAWa,eAAe;IAGjB,EAAE,EAAE,MAAM,CAAC;IAGX,UAAU,EAAE,OAAO,CAAC;IAGpB,IAAI,EAAE,MAAM,CAAC;IAGb,
|
|
1
|
+
{"version":3,"file":"EternityStorage.d.ts","sourceRoot":"","sources":["../../src/eternity/EternityStorage.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,qBAWa,eAAe;IAGjB,EAAE,EAAE,MAAM,CAAC;IAGX,UAAU,EAAE,OAAO,CAAC;IAGpB,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;IAGd,MAAM,EAAE,MAAM,CAAC;IAGf,GAAG,EAAE,QAAQ,CAAC;IAGd,MAAM,EAAE,QAAQ,CAAC;IAGjB,OAAO,EAAE,QAAQ,CAAC;IAGlB,QAAQ,EAAE,MAAM,CAAC;IAGjB,SAAS,EAAE,QAAQ,CAAC;IAGpB,KAAK,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IAGpC,KAAK,EAAE,MAAM,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,EAAE,MAAM,CAAC;CACzB;AAcD,MAAM,CAAC,OAAO,OAAO,eAAe;IAI5B,OAAO,CAAC,MAAM;aAEE,KAAK,EAAE,aAAa;gBAF5B,MAAM,EAAE,UAAU,EAEV,KAAK,EAAE,aAAa;IAKlC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,KAAA;;;;;;;;IAgBtB,MAAM,CAAC,EAAE,KAAA;IAqBT,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;IAoBpC,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW;IAsB5B,IAAI;CAMb"}
|
|
@@ -22,7 +22,7 @@ export let WorkflowStorage = class WorkflowStorage {
|
|
|
22
22
|
id;
|
|
23
23
|
isWorkflow;
|
|
24
24
|
name;
|
|
25
|
-
|
|
25
|
+
groupName;
|
|
26
26
|
input;
|
|
27
27
|
output;
|
|
28
28
|
eta;
|
|
@@ -51,7 +51,7 @@ __decorate([
|
|
|
51
51
|
__decorate([
|
|
52
52
|
Column({ dataType: "Char", length: 200, nullable: true }),
|
|
53
53
|
__metadata("design:type", String)
|
|
54
|
-
], WorkflowStorage.prototype, "
|
|
54
|
+
], WorkflowStorage.prototype, "groupName", void 0);
|
|
55
55
|
__decorate([
|
|
56
56
|
Column({ dataType: "Char" }),
|
|
57
57
|
__metadata("design:type", String)
|
|
@@ -104,8 +104,8 @@ WorkflowStorage = __decorate([
|
|
|
104
104
|
Table("Workflows"),
|
|
105
105
|
Index({
|
|
106
106
|
name: "IX_Workflows_Group",
|
|
107
|
-
columns: [{ name: (x) => x.
|
|
108
|
-
filter: (x) => x.
|
|
107
|
+
columns: [{ name: (x) => x.groupName, descending: false }],
|
|
108
|
+
filter: (x) => x.groupName !== null
|
|
109
109
|
}),
|
|
110
110
|
Index({
|
|
111
111
|
name: "IX_Workflows_ETA",
|