@puca/puca-core 9.20.5 → 9.21.1
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/core/services/auth.service.js +2 -0
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.d.ts +1 -1
- package/dist/core/services/bootstrap-commands.js +15 -0
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/bootstrap.service.d.ts +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +20 -6
- package/dist/core/services/crud-base-testable.service.js +122 -30
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +4 -3
- package/dist/core/services/crud-base.controller.js +16 -6
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-front-base.service.d.ts +4 -2
- package/dist/core/services/crud-front-base.service.js +60 -25
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/eval.service.js +2 -0
- package/dist/core/services/eval.service.js.map +1 -1
- package/dist/core/services/index.d.ts +1 -1
- package/dist/core/services/index.js +2 -2
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +1 -1
- package/dist/core/services/install.service.js +16 -0
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.js +5 -0
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/core/services/{migration.service.d.ts → migration/migration.service.d.ts} +19 -8
- package/dist/core/services/{migration.service.js → migration/migration.service.js} +96 -9
- package/dist/core/services/migration/migration.service.js.map +1 -0
- package/dist/core/services/report.service.js +2 -0
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/select-many-data.service.js +2 -0
- package/dist/core/services/select-many-data.service.js.map +1 -1
- package/dist/core/services/source/source.service.js +2 -0
- package/dist/core/services/source/source.service.js.map +1 -1
- package/dist/core/services/user-config.service.js +2 -0
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/core/services/user.service.js +6 -0
- package/dist/core/services/user.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +1 -0
- package/dist/models/crud-controller-especification-environment.js.map +1 -1
- package/dist/models/module-especification.d.ts +1 -1
- package/dist/models/table-dictionary.d.ts +2 -0
- package/dist/orm/cases/bo/ddl.service.d.ts +5 -2
- package/dist/orm/cases/bo/ddl.service.js +50 -28
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/bo/interfaces.d.ts +6 -1
- package/dist/orm/cases/bo/interfaces.js.map +1 -1
- package/dist/orm/cases/vanilla/interfaces.d.ts +5 -0
- package/dist/orm/cases/vanilla/sql-builder/ddl.service.js +3 -1
- package/dist/orm/cases/vanilla/sql-builder/ddl.service.js.map +1 -1
- package/dist/orm/cases/vanilla/sql-builder/helpers.d.ts +2 -1
- package/dist/orm/cases/vanilla/sql-builder/helpers.js +35 -3
- package/dist/orm/cases/vanilla/sql-builder/helpers.js.map +1 -1
- package/dist/orm/cases/vanilla/sql-builder/mutation.service.js +1 -0
- package/dist/orm/cases/vanilla/sql-builder/mutation.service.js.map +1 -1
- package/dist/orm/cases/vanilla/sql-builder/select.service.js +56 -15
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/plugins/numeric-sql-format-from-named/index.js +6 -1
- package/dist/orm/plugins/numeric-sql-format-from-named/index.js.map +1 -1
- package/dist/orm/services/managers/database-manager.service.js +4 -0
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/repository.d.ts +31 -8
- package/dist/orm/services/repository.js +67 -32
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/sql-layer.service.js +14 -1
- package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
- package/dist/orm/services/sql/sql-security-layer.service.js +2 -0
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -1
- package/dist/orm/services/sql/sql.service.d.ts +3 -1
- package/dist/orm/services/sql/sql.service.js +5 -3
- package/dist/orm/services/sql/sql.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/get-scripts-dependencies.sql +3 -0
- package/get-view-dependencies.sql +25 -0
- package/package.json +1 -1
- package/dist/core/services/migration.service.js.map +0 -1
|
@@ -16,41 +16,61 @@ class DDLService {
|
|
|
16
16
|
throw new Error('Varchar Fields must contain length');
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
|
-
|
|
20
|
-
const pucaTableName = `puca_${tableName}`;
|
|
21
|
-
const userTableName = `user_${tableName}`;
|
|
19
|
+
createOrRecreateView({ viewName, select }, user) {
|
|
22
20
|
return [
|
|
23
21
|
{
|
|
24
22
|
sql: this.sqlBuilderService.dropView({
|
|
25
23
|
ifExists: true,
|
|
26
|
-
viewName
|
|
24
|
+
viewName,
|
|
27
25
|
}),
|
|
28
26
|
args: [],
|
|
29
27
|
commandName: 'dropView',
|
|
30
28
|
},
|
|
31
29
|
{
|
|
32
30
|
sql: this.sqlBuilderService.createView({
|
|
33
|
-
viewName
|
|
34
|
-
select
|
|
35
|
-
from: pucaTableName,
|
|
36
|
-
join: [
|
|
37
|
-
{
|
|
38
|
-
tableName: userTableName,
|
|
39
|
-
on: {
|
|
40
|
-
v1: 'puca_pid',
|
|
41
|
-
operator: interfaces_1.ConditionalOperator.equals,
|
|
42
|
-
v2: 'user_pid',
|
|
43
|
-
},
|
|
44
|
-
},
|
|
45
|
-
],
|
|
46
|
-
forUpdate: false,
|
|
47
|
-
},
|
|
31
|
+
viewName,
|
|
32
|
+
select,
|
|
48
33
|
}),
|
|
49
34
|
args: [],
|
|
50
35
|
commandName: 'createView',
|
|
51
|
-
}
|
|
36
|
+
}
|
|
52
37
|
];
|
|
53
38
|
}
|
|
39
|
+
dropView(dropView, user) {
|
|
40
|
+
return [
|
|
41
|
+
{
|
|
42
|
+
sql: this.sqlBuilderService.dropView({
|
|
43
|
+
ifExists: dropView.ifExists,
|
|
44
|
+
viewName: dropView.viewName,
|
|
45
|
+
}),
|
|
46
|
+
args: [],
|
|
47
|
+
commandName: 'dropView',
|
|
48
|
+
}
|
|
49
|
+
];
|
|
50
|
+
}
|
|
51
|
+
createOrRecreateSystemView(tableName, user) {
|
|
52
|
+
const pucaTableName = `puca_${tableName}`;
|
|
53
|
+
const userTableName = `user_${tableName}`;
|
|
54
|
+
return this.createOrRecreateView({
|
|
55
|
+
viewName: tableName,
|
|
56
|
+
select: {
|
|
57
|
+
from: pucaTableName,
|
|
58
|
+
join: [
|
|
59
|
+
{
|
|
60
|
+
tableName: userTableName,
|
|
61
|
+
on: {
|
|
62
|
+
v1: 'puca_pid',
|
|
63
|
+
operator: interfaces_1.ConditionalOperator.equals,
|
|
64
|
+
v2: 'user_pid',
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
],
|
|
68
|
+
forUpdate: false,
|
|
69
|
+
with: [],
|
|
70
|
+
user,
|
|
71
|
+
}
|
|
72
|
+
}, user);
|
|
73
|
+
}
|
|
54
74
|
createTable(createTable, user) {
|
|
55
75
|
const { shouldGeneratePucaDicitonary = true, ignoreModuleNamePrefix = false, } = createTable;
|
|
56
76
|
if (_.snakeCase(createTable.tableName) !== createTable.tableName) {
|
|
@@ -114,6 +134,12 @@ class DDLService {
|
|
|
114
134
|
});
|
|
115
135
|
return retorno;
|
|
116
136
|
};
|
|
137
|
+
const values = {
|
|
138
|
+
name: createTable.tableName,
|
|
139
|
+
module: createTable.module,
|
|
140
|
+
crud_api: createTable.crudApi,
|
|
141
|
+
type: 'table'
|
|
142
|
+
};
|
|
117
143
|
const retorno = [
|
|
118
144
|
{
|
|
119
145
|
sql: this.sqlBuilderService.createTable({
|
|
@@ -127,11 +153,7 @@ class DDLService {
|
|
|
127
153
|
...(shouldGeneratePucaDicitonary
|
|
128
154
|
? this.sqlService.insert({
|
|
129
155
|
tableName: 'table_dictionary',
|
|
130
|
-
values
|
|
131
|
-
name: createTable.tableName,
|
|
132
|
-
module: createTable.module,
|
|
133
|
-
crud_api: createTable.crudApi,
|
|
134
|
-
},
|
|
156
|
+
values,
|
|
135
157
|
user,
|
|
136
158
|
})
|
|
137
159
|
: []),
|
|
@@ -164,7 +186,7 @@ class DDLService {
|
|
|
164
186
|
args: [],
|
|
165
187
|
commandName: 'foreignKey',
|
|
166
188
|
},
|
|
167
|
-
...this.
|
|
189
|
+
...this.createOrRecreateSystemView(createTable.tableName, user),
|
|
168
190
|
...(createTable.indices || [])
|
|
169
191
|
.map(index => this.createIndex({
|
|
170
192
|
tableName: createTable.tableName,
|
|
@@ -244,7 +266,7 @@ class DDLService {
|
|
|
244
266
|
},
|
|
245
267
|
user
|
|
246
268
|
}),
|
|
247
|
-
...this.
|
|
269
|
+
...this.createOrRecreateSystemView(alterTable.tableName, user),
|
|
248
270
|
];
|
|
249
271
|
return retorno;
|
|
250
272
|
}
|
|
@@ -271,7 +293,7 @@ class DDLService {
|
|
|
271
293
|
args: [],
|
|
272
294
|
commandName: 'dropField'
|
|
273
295
|
},
|
|
274
|
-
...this.
|
|
296
|
+
...this.createOrRecreateSystemView(a.tableName, user),
|
|
275
297
|
];
|
|
276
298
|
return retorno;
|
|
277
299
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/ddl.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,
|
|
1
|
+
{"version":3,"file":"ddl.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/ddl.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,sDAA0F;AAI1F,MAAa,UAAU;IACrB,YACmB,iBAAoC,EACpC,UAAuB;QADvB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,eAAU,GAAV,UAAU,CAAa;IACtC,CAAC;IACG,WAAW,CAAC,CAAa;QAC/B,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,+BAAkB,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YACtD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;IACH,CAAC;IAED,oBAAoB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAc,EAAE,IAAU;QAC/D,OAAO;YACL;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;oBACnC,QAAQ,EAAE,IAAI;oBACd,QAAQ;iBACT,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,UAAU;aACxB;YACD;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;oBACrC,QAAQ;oBACR,MAAM;iBACP,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,YAAY;aAC1B;SACF,CAAC;IACJ,CAAC;IAGD,QAAQ,CAAC,QAAkB,EAAE,IAAU;QACrC,OAAO;YACL;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;oBACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;iBAC5B,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,UAAU;aACxB;SACF,CAAC;IACJ,CAAC;IAEO,0BAA0B,CAAC,SAAiB,EAAE,IAAU;QAC9D,MAAM,aAAa,GAAG,QAAQ,SAAS,EAAE,CAAC;QAC1C,MAAM,aAAa,GAAG,QAAQ,SAAS,EAAE,CAAC;QAE1C,OAAO,IAAI,CAAC,oBAAoB,CAC9B;YACE,QAAQ,EAAE,SAAS;YACnB,MAAM,EACN;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE;oBACJ;wBACE,SAAS,EAAE,aAAa;wBACxB,EAAE,EAAE;4BACF,EAAE,EAAE,UAAU;4BACd,QAAQ,EAAE,gCAAmB,CAAC,MAAM;4BACpC,EAAE,EAAE,UAAU;yBACf;qBACF;iBACF;gBACD,SAAS,EAAE,KAAK;gBAChB,IAAI,EAAE,EAAE;gBACR,IAAI;aACL;SACF,EAAE,IAAI,CAAC,CAAA;IACZ,CAAC;IAED,WAAW,CACT,WAGC,EACD,IAAU;QAEV,MAAM,EACJ,4BAA4B,GAAG,IAAI,EACnC,sBAAsB,GAAG,KAAK,GAC/B,GAAG,WAAW,CAAC;QAEhB,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC,SAAS,EAAE;YAChE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;QACD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QACD,IACE,CAAC,sBAAsB;YACvB,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAC/B,GAAG,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CACtC;YACD,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAC1C;YACA,MAAM,IAAI,KAAK,CACb,iDAAiD,CAAC,CAAC,SAAS,CAC1D,WAAW,CAAC,MAAM,CACnB,IAAI,WAAW,CAAC,SAAS,GAAG,CAC9B,CAAC;SACH;QACD,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC7B,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,QAAQ,WAAW,CAAC,SAAS,EAAE,CAAC;QACtD,MAAM,aAAa,GAAG,QAAQ,WAAW,CAAC,SAAS,EAAE,CAAC;QACtD,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAC1D,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACP,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,+BAAkB,CAAC,SAAS;iBACnC;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,+BAAkB,CAAC,SAAS;iBACnC;gBACD;oBACE,IAAI,EAAE,kBAAkB;oBACxB,IAAI,EAAE,+BAAkB,CAAC,SAAS;iBACnC;aAYc;YACjB,UAAU,EAAE,EAAkB;SAC/B,CACF,CAAC;QACF,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,+BAAkB,CAAC,IAAI;SAC9B,CAAC;QACF,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,+BAAkB,CAAC,IAAI;SAC9B,CAAC;QACF,MAAM,gBAAgB,GAAG,CAAC,CAAa,EAAE,KAAa,EAAgB,EAAE;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CACpC;gBACE,SAAS,EAAE,kBAAkB;gBAC7B,MAAM,EAAE;oBACN,MAAM,EAAE,WAAW,CAAC,SAAS;oBAC7B,UAAU,EAAE,KAAK;oBACjB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,+BAAkB,CAAC,SAAS,CAAC,CAAC;wBAC7C,+BAAkB,CAAC,OAAO,CAAC,CAAC;wBAC5B,CAAC,CAAC,IAAI;oBACR,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;oBACxB,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;iBAC5C;gBACD,IAAI;aACL,CACF,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;QAEF,MAAM,MAAM,GAAoB;YAC9B,IAAI,EAAE,WAAW,CAAC,SAAS;YAC3B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,QAAQ,EAAE,WAAW,CAAC,OAAO;YAC7B,IAAI,EAAE,OAAO;SACd,CAAA;QAED,MAAM,OAAO,GAAiB;YAC5B;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;oBACtC,SAAS,EAAE,aAAa;oBACxB,UAAU,EAAE,cAAc;oBAC1B,MAAM,EAAE,UAAU;iBACnB,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,iBAAiB;aAC/B;YACD,GAAG,CAAC,4BAA4B;gBAC9B,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CACtB;oBACE,SAAS,EAAE,kBAAkB;oBAC7B,MAAM;oBACN,IAAI;iBACL,CACF;gBACD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAkB,CAAC;YACpD;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;oBACtC,SAAS,EAAE,aAAa;oBACxB,UAAU,EAAE,cAAc;oBAC1B,MAAM,EAAE,UAAU;iBACnB,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,iBAAiB;aAC/B;YACD,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YACpC;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;oBACrC,KAAK,EAAE;wBACL,SAAS,EAAE,aAAa;wBACxB,KAAK,EAAE,cAAc,CAAC,IAAI;qBAC3B;oBACD,UAAU,EAAE;wBACV,SAAS,EAAE,aAAa;wBACxB,KAAK,EAAE,cAAc,CAAC,IAAI;qBAC3B;iBACF,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,YAAY;aAC1B;YACD,GAAG,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC;YAC/D,GAAG,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;iBAC3B,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;gBAC7B,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,EAAE,IAAI,CAAC,CAAC;iBACR,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAkB,CAAC;SACrD,CAAA;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAAA,CAAC;IACjC,CAAC;IAED,SAAS,CAAC,SAAoB,EAAE,IAAU;QACxC,MAAM,aAAa,GAAG,QAAQ,SAAS,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,QAAQ,SAAS,CAAC,SAAS,EAAE,CAAC;QAEpD,MAAM,OAAO,GAAiB;YAC5B,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACxB,SAAS,EAAE,kBAAkB;gBAC7B,QAAQ,EAAE,SAAS,CAAC,kBAAkB;gBACtC,IAAI;aACL,CAAC;YACF,GAAG,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;oBAC5B,SAAS,EAAE,kBAAkB;oBAC7B,QAAQ,EAAE,KAAK;oBACf,IAAI;iBACL,CAAC,CAAA;YACJ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAkB,CAAC;YACpD;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;oBACnC,QAAQ,EAAE,KAAK;oBACf,QAAQ,EAAE,SAAS,CAAC,SAAS;iBAC9B,CAAC;gBACF,WAAW,EAAE,UAAU;aACxB;YACD;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBACpC,SAAS,EAAE,aAAa;iBACzB,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,eAAe;aAC7B;YACD;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBACpC,SAAS,EAAE,aAAa;iBACzB,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,eAAe;aAC7B;SACF,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAEhB,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,mBAAmB,CACjB,UAA+B,EAC/B,IAAU;QAEV,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAE7B,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAClE,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;QAE7B,MAAM,OAAO,GAAiB;YAC5B;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC;oBAC9C,SAAS;oBACT,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,qBAAqB;aACnC;YACD,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CACvB;gBACE,SAAS,EAAE,kBAAkB;gBAC7B,MAAM,EAAE;oBACN,MAAM,EAAE,UAAU,CAAC,SAAS;oBAC5B,UAAU,EAAE,SAAS;oBACrB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,IAAI,EAAE,UAAU,CAAC,IAAI,KAAK,+BAAkB,CAAC,SAAS,CAAC,CAAC;wBACtD,+BAAkB,CAAC,OAAO,CAAC,CAAC;wBAC5B,UAAU,CAAC,IAAI;oBACjB,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,IAAI;oBACjC,WAAW,EAAE,UAAU,CAAC,WAAW,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;iBACrD;gBACD,IAAI;aACL,CACF;YACD,GAAG,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC;SAC/D,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,oBAAoB,CAAC,CAAuB,EAAE,IAAU;QACtD,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,SAAS,EAAE,CAAA;QAClF,MAAM,OAAO,GAAiB;YAC5B,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACxB,SAAS,EAAE,kBAAkB;gBAC7B,QAAQ,EAAE,CAAC,CAAC,kBAAkB;gBAC9B,IAAI;aACL,CAAC;YACF;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC;oBACnC,QAAQ,EAAE,KAAK;oBACf,QAAQ,EAAE,CAAC,CAAC,SAAS;iBACtB,CAAC;gBACF,WAAW,EAAE,UAAU;aACxB;YACD;gBACE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC;oBAC/C,SAAS;oBACT,IAAI,EAAE,CAAC,CAAC,IAAI;iBACb,CAAC;gBACF,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,WAAW;aACzB;YACD,GAAG,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC;SACtD,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,WAAW,CAAC,WAAwB,EAAE,IAAU;QAC9C,MAAM,MAAM,GAAG,CACb,KAAuB,EACvB,SAAiB,EACL,EAAE,CAAC,CAAC;YAChB,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;gBACtC,SAAS,EAAE,SAAS;gBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC;YACF,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa;SAC3B,CAAC,CAAC;QAEH,MAAM,KAAK,GACT,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;YAC5D,WAAW,CAAC,MAAM,CAAC,MAAM;YACzB,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;gBAC7D,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;SACH;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAExE,OAAO;YACL,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,EAAE,QAAQ,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;YACpH,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,EAAE,QAAQ,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;SACrH,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;CACF;AApYD,gCAoYC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { User } from '../../../models/user';
|
|
2
|
-
import { TableFieldTypeEnum as TableFieldTypeEnumOrig, TableFieldType as TableFieldTypeOrig, ConditionalOperator as ConditionalOperatorOrig, SelectField as SelectFieldOrig, JoinMode as JoinModeOrig, Join as JoinOrig, AscDesc as AscDescOrig, OrderByField as OrderByFieldOrig, From as FromOrig, Select as SelectOrig, WhereOperator as WhereOperatorOrig, Where as WhereOrig } from '../vanilla/interfaces';
|
|
2
|
+
import { TableFieldTypeEnum as TableFieldTypeEnumOrig, TableFieldType as TableFieldTypeOrig, ConditionalOperator as ConditionalOperatorOrig, SelectField as SelectFieldOrig, JoinMode as JoinModeOrig, Join as JoinOrig, AscDesc as AscDescOrig, OrderByField as OrderByFieldOrig, From as FromOrig, Select as SelectOrig, WhereOperator as WhereOperatorOrig, Where as WhereOrig, With as WithOrig } from '../vanilla/interfaces';
|
|
3
3
|
export interface CreateTableIndex {
|
|
4
4
|
fields: string[];
|
|
5
5
|
unique: boolean;
|
|
@@ -19,6 +19,10 @@ export interface DropTable {
|
|
|
19
19
|
tableDictionaryPid: string;
|
|
20
20
|
tableName: string;
|
|
21
21
|
}
|
|
22
|
+
export interface CreateView {
|
|
23
|
+
viewName: string;
|
|
24
|
+
select: Select;
|
|
25
|
+
}
|
|
22
26
|
export declare type AlterTableAddColumn = {
|
|
23
27
|
tableName: string;
|
|
24
28
|
} & TableField;
|
|
@@ -52,6 +56,7 @@ export declare type OrderByField = OrderByFieldOrig;
|
|
|
52
56
|
export declare type From = FromOrig;
|
|
53
57
|
export declare type WhereOperator = WhereOperatorOrig;
|
|
54
58
|
export declare type Where = WhereOrig;
|
|
59
|
+
export declare type With = WithOrig;
|
|
55
60
|
export interface Select extends SelectOrig {
|
|
56
61
|
user: User;
|
|
57
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/interfaces.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/interfaces.ts"],"names":[],"mappings":";;;AACA,sDAc8B;AAqDhB,QAAA,kBAAkB,GAAG,+BAAsB,CAAA;AAE3C,QAAA,mBAAmB,GAAG,gCAAuB,CAAA;AAE7C,QAAA,QAAQ,GAAG,qBAAY,CAAA;AAEvB,QAAA,OAAO,GAAG,oBAAW,CAAA"}
|
|
@@ -139,6 +139,10 @@ export declare type From = {
|
|
|
139
139
|
table: string;
|
|
140
140
|
alias: string;
|
|
141
141
|
} | string;
|
|
142
|
+
export interface With {
|
|
143
|
+
alias: string;
|
|
144
|
+
select: Select;
|
|
145
|
+
}
|
|
142
146
|
export interface Select {
|
|
143
147
|
fields?: SelectField[];
|
|
144
148
|
from: From;
|
|
@@ -150,6 +154,7 @@ export interface Select {
|
|
|
150
154
|
offset?: number;
|
|
151
155
|
groupBy?: SelectField[];
|
|
152
156
|
forUpdate?: boolean;
|
|
157
|
+
with?: With[];
|
|
153
158
|
}
|
|
154
159
|
export interface WhereOperator {
|
|
155
160
|
comment?: string;
|
|
@@ -63,7 +63,9 @@ class SqlBuilderDdlService {
|
|
|
63
63
|
return templateAlterTableDropColumn(helpers_1.sqlEscape(field.tableName), helpers_1.sqlEscape(field.name));
|
|
64
64
|
}
|
|
65
65
|
createView(createView) {
|
|
66
|
-
const
|
|
66
|
+
const selectText = this.selectService.selectText(createView.select);
|
|
67
|
+
const args = helpers_1.normalizeArgs(createView.select.args);
|
|
68
|
+
const retorno = createViewTemplate(helpers_1.sqlEscape(createView.viewName), helpers_1.convertArgsIntoLiteral(selectText, args));
|
|
67
69
|
return retorno;
|
|
68
70
|
}
|
|
69
71
|
foreignKey(fk) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/ddl.service.ts"],"names":[],"mappings":";;;AAAA,uEAA8D;AAC9D,8CAAoL;AAEpL,
|
|
1
|
+
{"version":3,"file":"ddl.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/ddl.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export declare function normalizeArgs(args: any): any;
|
|
2
|
-
export declare const sqlEscape: (str: string) => string;
|
|
2
|
+
export declare const sqlEscape: (str: string, formatAS?: 'identifier' | 'literal') => string;
|
|
3
|
+
export declare const convertArgsIntoLiteral: (sqlText: string, args: any) => string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sqlEscape = exports.normalizeArgs = void 0;
|
|
3
|
+
exports.convertArgsIntoLiteral = exports.sqlEscape = exports.normalizeArgs = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const pgEscape = require("pg-escape");
|
|
6
6
|
function normalizeArgs(args) {
|
|
@@ -19,11 +19,43 @@ function normalizeArgs(args) {
|
|
|
19
19
|
return retorno;
|
|
20
20
|
}
|
|
21
21
|
exports.normalizeArgs = normalizeArgs;
|
|
22
|
-
const sqlEscape = (str) => {
|
|
22
|
+
const sqlEscape = (str, formatAS = 'identifier') => {
|
|
23
23
|
if (!str) {
|
|
24
24
|
return str;
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
if (formatAS === 'literal') {
|
|
27
|
+
return pgEscape.literal(str);
|
|
28
|
+
}
|
|
29
|
+
else if (formatAS === 'identifier') {
|
|
30
|
+
return pgEscape.ident(str);
|
|
31
|
+
}
|
|
32
|
+
throw new Error(`formatAS '${formatAS}' not implemented`);
|
|
27
33
|
};
|
|
28
34
|
exports.sqlEscape = sqlEscape;
|
|
35
|
+
const convertArgsIntoLiteral = (sqlText, args) => {
|
|
36
|
+
return sqlText.replace(/(\$\w+)/g, (match) => {
|
|
37
|
+
const key = match.replace('$', '');
|
|
38
|
+
const value = args[key];
|
|
39
|
+
if (value === null) {
|
|
40
|
+
return 'null';
|
|
41
|
+
}
|
|
42
|
+
if (value === undefined) {
|
|
43
|
+
return 'null';
|
|
44
|
+
}
|
|
45
|
+
if (value instanceof Date) {
|
|
46
|
+
return `'${value.toISOString()}'`;
|
|
47
|
+
}
|
|
48
|
+
if (Array.isArray(value)) {
|
|
49
|
+
return `'{${value.map(v => exports.sqlEscape(v, 'literal')).join(',')}}'`;
|
|
50
|
+
}
|
|
51
|
+
if (typeof value === 'object') {
|
|
52
|
+
return exports.sqlEscape(JSON.stringify(value), 'literal');
|
|
53
|
+
}
|
|
54
|
+
if (typeof value === 'string') {
|
|
55
|
+
return exports.sqlEscape(value, 'literal');
|
|
56
|
+
}
|
|
57
|
+
return value;
|
|
58
|
+
});
|
|
59
|
+
};
|
|
60
|
+
exports.convertArgsIntoLiteral = convertArgsIntoLiteral;
|
|
29
61
|
//# sourceMappingURL=helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/helpers.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,sCAAqC;AAErC,SAAgB,aAAa,CAAC,IAAI;IAChC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACxD,MAAM,OAAO,GAAG;YAKd,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;SACrC;aACE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,OAAO,CAAC;AACjB,CAAC;AAlBD,sCAkBC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAW,EAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/helpers.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,sCAAqC;AAErC,SAAgB,aAAa,CAAC,IAAI;IAChC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACxD,MAAM,OAAO,GAAG;YAKd,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;SACrC;aACE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,OAAO,CAAC;AACjB,CAAC;AAlBD,sCAkBC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,WAAqC,YAAY,EAAU,EAAE;IAClG,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,GAAG,CAAA;KACX;IAED,IAAG,QAAQ,KAAK,SAAS,EAAE;QACzB,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;KAC7B;SAAM,IAAI,QAAQ,KAAK,YAAY,EAAE;QACpC,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAC3B;IAED,MAAM,IAAI,KAAK,CAAC,aAAa,QAAQ,mBAAmB,CAAC,CAAA;AAC3D,CAAC,CAAA;AAZY,QAAA,SAAS,aAYrB;AAEM,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,IAAS,EAAU,EAAE;IAC3E,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,OAAO,MAAM,CAAC;SACf;QACD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,MAAM,CAAC;SACf;QACD,IAAI,KAAK,YAAY,IAAI,EAAE;YACzB,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;SACnC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAExB,OAAO,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;SACnE;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,iBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,iBAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;SACnC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC,CAAA;AA5BY,QAAA,sBAAsB,0BA4BlC"}
|
|
@@ -25,6 +25,7 @@ class MutationService {
|
|
|
25
25
|
from: null,
|
|
26
26
|
where: insert.where,
|
|
27
27
|
forUpdate: false,
|
|
28
|
+
with: [],
|
|
28
29
|
}), list_as_string_1.default(this.selectService.buildFields(insert.returning), ', '));
|
|
29
30
|
const normalizedValues = helpers_1.normalizeArgs(Object.assign(Object.assign({}, insert.args), insert.values));
|
|
30
31
|
const retorno = numeric_sql_format_from_named_1.default(this.logger, sql, normalizedValues);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutation.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/mutation.service.ts"],"names":[],"mappings":";;;AACA,uEAA8D;AAC9D,kGAA8E;AAE9E,uCAA0D;AAE1D,6DAA0D;AAE1D,MAAM,cAAc,GAAG,CACrB,KAAa,EACb,IAAY,EACZ,MAAc,EACd,SAAiB,EACjB,EAAE,CACF,eAAe,KAAK,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAA;AAE1F,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,SAAiB,EAAE,EAAE,CACzE,eAAe,KAAK,UAAU,KAAK,GAAG;IACtC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE9C,MAAM,cAAc,GAAG;IACrB,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,KAAK,EAAE;IACxC,IAAI,EAAE,CAAC,KAAa,EAAE,GAAW,EAAE,KAAa,EAAE,SAAiB,EAAE,EAAE,CACrE,UAAU,KAAK,QAAQ,GAAG,UAAU,KAAK,GAAG;QAC5C,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;CAC9C,CAAC;AAEF,MAAa,eAAe;IAE1B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QADxC,WAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACE,CAAC;IAE9D,MAAM,CAAC,MAAc;QACnB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,cAAc,CACxB,mBAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EACnB,wBAAY,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EACxD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;YAC5B,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"mutation.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/mutation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,36 @@ const numeric_sql_format_from_named_1 = require("../../../plugins/numeric-sql-fo
|
|
|
8
8
|
const helpers_1 = require("./helpers");
|
|
9
9
|
const logger_1 = require("../../../../core/services/logger");
|
|
10
10
|
const joinTemplate = (joinMode, table, alias, where) => `${joinMode} join ${table} ${alias} on ${where}`;
|
|
11
|
-
const selectTemplate = (fields, from, join, where, groupBy, orderBy, limit, offset, forUpdate) =>
|
|
11
|
+
const selectTemplate = (wit, fields, from, join, where, groupBy, orderBy, limit, offset, forUpdate) => {
|
|
12
|
+
let result = '';
|
|
13
|
+
if (wit) {
|
|
14
|
+
result += `with ${wit} `;
|
|
15
|
+
}
|
|
16
|
+
result += `select ${fields} `;
|
|
17
|
+
if (from) {
|
|
18
|
+
result += `from ${from} `;
|
|
19
|
+
}
|
|
20
|
+
if (join) {
|
|
21
|
+
result += `${join} `;
|
|
22
|
+
}
|
|
23
|
+
result += `where ( ${where} ) `;
|
|
24
|
+
if (groupBy) {
|
|
25
|
+
result += `${groupBy} `;
|
|
26
|
+
}
|
|
27
|
+
if (orderBy) {
|
|
28
|
+
result += `${orderBy} `;
|
|
29
|
+
}
|
|
30
|
+
if (limit) {
|
|
31
|
+
result += `${limit} `;
|
|
32
|
+
}
|
|
33
|
+
if (offset) {
|
|
34
|
+
result += `${offset} `;
|
|
35
|
+
}
|
|
36
|
+
if (forUpdate) {
|
|
37
|
+
result += 'for update ';
|
|
38
|
+
}
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
12
41
|
const orderByTemplate = (fields) => `order by ${fields}`;
|
|
13
42
|
const groupByTemplate = (fields) => `group by ${fields}`;
|
|
14
43
|
const whereTemplates = {
|
|
@@ -41,15 +70,23 @@ class InvalidOffset extends Error {
|
|
|
41
70
|
}
|
|
42
71
|
}
|
|
43
72
|
exports.InvalidOffset = InvalidOffset;
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
'
|
|
47
|
-
'
|
|
48
|
-
'
|
|
49
|
-
'
|
|
50
|
-
'
|
|
51
|
-
'
|
|
52
|
-
|
|
73
|
+
const defaultFunctionTemplate = (func, args) => `${func} ( ${list_as_string_1.default(args, ', ')} )`;
|
|
74
|
+
const allowedFunction = {
|
|
75
|
+
sum: (args) => defaultFunctionTemplate('sum', args),
|
|
76
|
+
count: (args) => defaultFunctionTemplate('count', args),
|
|
77
|
+
max: (args) => defaultFunctionTemplate('max', args),
|
|
78
|
+
min: (args) => defaultFunctionTemplate('min', args),
|
|
79
|
+
avg: (args) => defaultFunctionTemplate('avg', args),
|
|
80
|
+
coalesce: (args) => defaultFunctionTemplate('coalesce', args),
|
|
81
|
+
string_agg: (args) => defaultFunctionTemplate('string_agg', args),
|
|
82
|
+
add: (args) => args.map(a => `( ${a} )`).join(' + '),
|
|
83
|
+
subtract: (args) => args.map(a => `( ${a} )`).join(' - '),
|
|
84
|
+
multiply: (args) => args.map(a => `( ${a} )`).join(' * '),
|
|
85
|
+
divide: (args) => args.map(a => `( ${a} )`).join(' / '),
|
|
86
|
+
row_number: (args) => `row_number() over (order by ${args.join(', ')})`,
|
|
87
|
+
cast: (args) => `( ${args[0]} )::${args[1]}`,
|
|
88
|
+
date_trunc: (args) => defaultFunctionTemplate('date_trunc', args),
|
|
89
|
+
};
|
|
53
90
|
class SelectService {
|
|
54
91
|
constructor() {
|
|
55
92
|
this.logger = new logger_1.Logger(SelectService.name);
|
|
@@ -111,13 +148,14 @@ class SelectService {
|
|
|
111
148
|
throw new Error(`invalid typeof ${field} === ${typeof field === 'number'}`);
|
|
112
149
|
}
|
|
113
150
|
if ('function' in field) {
|
|
114
|
-
|
|
151
|
+
const f = allowedFunction[field.function];
|
|
152
|
+
if (!f) {
|
|
115
153
|
throw new Error(`invalid function ${field.function}`);
|
|
116
154
|
}
|
|
117
|
-
const
|
|
155
|
+
const functionName = helpers_1.sqlEscape(field.function);
|
|
118
156
|
const args = (field.args || []).map(a => this.buildField(a));
|
|
119
|
-
const
|
|
120
|
-
return addAliasAdCast(
|
|
157
|
+
const functionStr = f(args);
|
|
158
|
+
return addAliasAdCast(functionStr, functionName);
|
|
121
159
|
}
|
|
122
160
|
if ('field' in field) {
|
|
123
161
|
const table = field.table;
|
|
@@ -249,7 +287,10 @@ class SelectService {
|
|
|
249
287
|
? select.from
|
|
250
288
|
: `${select.from.table} ${select.from.alias}`;
|
|
251
289
|
}
|
|
252
|
-
const
|
|
290
|
+
const wit = _.isEmpty(select.with) ? '' : (select.with || []).map(w => {
|
|
291
|
+
return `${helpers_1.sqlEscape(w.alias)} as ( ${this.selectText(w.select)} )`;
|
|
292
|
+
}).join(', ');
|
|
293
|
+
const sql = selectTemplate(wit, list_as_string_1.default(fields, ', '), from, list_as_string_1.default(sqlJoin, ' '), where, groupBy, orderBy, limit, offset, select.forUpdate);
|
|
253
294
|
return sql;
|
|
254
295
|
}
|
|
255
296
|
select(select) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/select.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"select.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/select.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,12 @@ function numericFromNamed(logger, sql, parameters) {
|
|
|
20
20
|
}
|
|
21
21
|
const interpolatedSql = _.reduce(fillTokens, function (partiallyInterpolated, token, index) {
|
|
22
22
|
const replaceAllPattern = new RegExp('\\$' + fillTokens[index] + '\\b', 'g');
|
|
23
|
-
|
|
23
|
+
let newToken = '$' + (index + 1);
|
|
24
|
+
const tokenValue = iParameters[token];
|
|
25
|
+
if (_.isNumber(tokenValue)) {
|
|
26
|
+
newToken += '::numeric';
|
|
27
|
+
}
|
|
28
|
+
return partiallyInterpolated.replace(replaceAllPattern, newToken);
|
|
24
29
|
}, sql);
|
|
25
30
|
const out = {
|
|
26
31
|
sql: interpolatedSql,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/orm/plugins/numeric-sql-format-from-named/index.ts"],"names":[],"mappings":";;AAEA,4BAA2B;AAG3B,MAAM,YAAY,GAAG,uCAAuC,CAAC;AAE7D,SAAwB,gBAAgB,CAAC,MAAc,EAAE,GAAW,EAAE,UAAkB;IACtF,MAAM,WAAW,GAAG,UAAU,IAAI,EAAE,CAAA;IACpC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,CAC1B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,UAAS,KAAK;QAC3C,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,CAAC,YAAY,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;IACxE,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,UAAS,KAAK;QACjD,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,CAAC,CAAC,UAAU,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEpE,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,uBAAuB,OAAO,KAAK,CAAC,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,KAAK,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAC9B,UAAU,EACV,UAAS,qBAAqB,EAAE,KAAK,EAAE,KAAK;QAC1C,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAClC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,KAAK,EACjC,GAAG,CACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/orm/plugins/numeric-sql-format-from-named/index.ts"],"names":[],"mappings":";;AAEA,4BAA2B;AAG3B,MAAM,YAAY,GAAG,uCAAuC,CAAC;AAE7D,SAAwB,gBAAgB,CAAC,MAAc,EAAE,GAAW,EAAE,UAAkB;IACtF,MAAM,WAAW,GAAG,UAAU,IAAI,EAAE,CAAA;IACpC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,CAC1B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,UAAS,KAAK;QAC3C,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,CAAC,YAAY,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;IACxE,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,UAAS,KAAK;QACjD,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,CAAC,CAAC,UAAU,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAEpE,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,uBAAuB,OAAO,KAAK,CAAC,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,KAAK,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAC9B,UAAU,EACV,UAAS,qBAAqB,EAAE,KAAK,EAAE,KAAK;QAC1C,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAClC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,KAAK,EACjC,GAAG,CACJ,CAAC;QAIF,IAAI,QAAQ,GAAG,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;QAEhC,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;QACrC,IAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YACzB,QAAQ,IAAI,WAAW,CAAA;SACxB;QAED,OAAO,qBAAqB,CAAC,OAAO,CAClC,iBAAiB,EACjB,QAAQ,CACT,CAAC;IACJ,CAAC,EACD,GAAG,CACJ,CAAC;IAEF,MAAM,GAAG,GAAG;QACV,GAAG,EAAE,eAAe;QACpB,IAAI,EAAE,UAAU;KACjB,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC;AArDD,mCAqDC"}
|
|
@@ -83,6 +83,10 @@ class Database {
|
|
|
83
83
|
apply: () => (typeof arg === 'boolean'),
|
|
84
84
|
exec: () => arg
|
|
85
85
|
},
|
|
86
|
+
{
|
|
87
|
+
apply: () => !isNaN(arg),
|
|
88
|
+
exec: () => arg
|
|
89
|
+
},
|
|
86
90
|
{
|
|
87
91
|
apply: () => _.isArray(arg),
|
|
88
92
|
exec: () => arg.length ? `'{${arg.reduce((a, b) => `${a},${b}`)}}'` : `'{}'`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}
|