@puca/puca-core 6.2.0 → 7.0.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/.vscode/launch.json +23 -23
- package/dist/core/services/bootstrap-commands.js +73 -30
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/bootstrap.service.js +3 -1
- package/dist/core/services/bootstrap.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +16 -15
- package/dist/core/services/crud-base-testable.service.js +39 -59
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +2 -2
- package/dist/core/services/crud-base.controller.js +13 -7
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-base.service.d.ts +2 -2
- package/dist/core/services/crud-base.service.js +2 -1
- package/dist/core/services/crud-base.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.d.ts +5 -11
- package/dist/core/services/crud-front-base.service.js +36 -8
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/index.js +1 -1
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +7 -4
- package/dist/core/services/install.service.js +222 -44
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +4 -1
- package/dist/core/services/life-cycle.service.js +20 -6
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +3 -3
- package/dist/core/services/migration.service.js +27 -46
- package/dist/core/services/migration.service.js.map +1 -1
- package/dist/core/services/module-config.service.js +1 -0
- package/dist/core/services/module-config.service.js.map +1 -1
- package/dist/core/services/user-config.service.d.ts +6 -0
- package/dist/core/services/user-config.service.js +10 -4
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/models/crud-controller-especification-enviroment.d.ts +12 -7
- package/dist/models/crud-controller-especification.d.ts +6 -1
- package/dist/models/crud-controller-especification.js +1 -0
- package/dist/models/crud-controller-especification.js.map +1 -1
- package/dist/models/module-config.d.ts +1 -0
- package/dist/models/module-especification.d.ts +1 -0
- package/dist/models/table-dictionary.d.ts +12 -0
- package/dist/orm/cases/ddl/ddl.service.d.ts +2 -2
- package/dist/orm/cases/ddl/ddl.service.js +1 -1
- package/dist/orm/cases/ddl/ddl.service.js.map +1 -1
- package/dist/orm/cases/index.d.ts +2 -4
- package/dist/orm/cases/index.js +4 -4
- package/dist/orm/cases/index.js.map +1 -1
- package/dist/orm/cases/sql/sql.service.d.ts +10 -6
- package/dist/orm/cases/sql/sql.service.js +37 -54
- package/dist/orm/cases/sql/sql.service.js.map +1 -1
- package/dist/orm/cases/sql-builder/mutation.service.d.ts +1 -0
- package/dist/orm/cases/sql-builder/mutation.service.js +2 -3
- package/dist/orm/cases/sql-builder/mutation.service.js.map +1 -1
- package/dist/orm/cases/sql-builder/select.service.js +16 -18
- package/dist/orm/cases/sql-builder/select.service.js.map +1 -1
- package/dist/orm/interfaces.d.ts +6 -4
- package/dist/orm/services/index.d.ts +3 -1
- package/dist/orm/services/index.js +5 -3
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/managers/database-manager.service.js +15 -1
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/managers/puca-orm-client.service.js +2 -4
- package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +3 -3
- package/dist/orm/services/repository-factory.js +3 -3
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +3 -3
- package/dist/orm/services/repository.js +13 -12
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql.service.d.ts +29 -0
- package/dist/orm/services/sql.service.js +437 -0
- package/dist/orm/services/sql.service.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/javascriptV1/javascriptV1.js +81 -81
- package/package.json +83 -83
- package/puca-orm.proto +37 -37
|
@@ -1,20 +1,24 @@
|
|
|
1
|
-
import { Delete, Insert, Select, SqlCommand, Update } from '../../interfaces';
|
|
1
|
+
import { Delete as DeleteOrig, Insert as InsertOrigi, Select, SqlCommand, Update as UpdateOrig, Where } from '../../interfaces';
|
|
2
2
|
import { UuidService } from '../../../plugins/uuid/uuid.service';
|
|
3
3
|
import { SqlBuilderService } from '../sql-builder/sql-builder.service';
|
|
4
4
|
import { User } from '../../../models/user';
|
|
5
|
-
export declare
|
|
5
|
+
export declare type Insert = InsertOrigi;
|
|
6
|
+
export declare type Update = UpdateOrig;
|
|
7
|
+
export declare type Delete = DeleteOrig;
|
|
8
|
+
export declare class CSqlService {
|
|
6
9
|
private readonly uuid;
|
|
7
10
|
private readonly sqlBuilderService;
|
|
8
11
|
constructor(uuid: UuidService, sqlBuilderService: SqlBuilderService);
|
|
9
12
|
insert(insert: Insert & {
|
|
10
|
-
|
|
11
|
-
|
|
13
|
+
args?: any;
|
|
14
|
+
condition?: Where;
|
|
12
15
|
}, user: User): SqlCommand[];
|
|
13
16
|
update(update: Update & {
|
|
14
|
-
|
|
17
|
+
where?: Where;
|
|
15
18
|
}, user: User): SqlCommand[];
|
|
16
19
|
delete(d: Delete & {
|
|
17
|
-
|
|
20
|
+
args?: any;
|
|
21
|
+
where?: Where;
|
|
18
22
|
}, user: User): SqlCommand[];
|
|
19
23
|
select(originalSelect: Select, user?: User): SqlCommand;
|
|
20
24
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.CSqlService = void 0;
|
|
4
4
|
const interfaces_1 = require("../../interfaces");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const computePucaTable = (table) => `puca_${table}`;
|
|
@@ -54,7 +54,7 @@ const applyWildCardStrategies = ({ args, user }) => {
|
|
|
54
54
|
return r;
|
|
55
55
|
}, {});
|
|
56
56
|
};
|
|
57
|
-
class
|
|
57
|
+
class CSqlService {
|
|
58
58
|
constructor(uuid, sqlBuilderService) {
|
|
59
59
|
this.uuid = uuid;
|
|
60
60
|
this.sqlBuilderService = sqlBuilderService;
|
|
@@ -95,30 +95,21 @@ class SqlService {
|
|
|
95
95
|
returningUser: [],
|
|
96
96
|
});
|
|
97
97
|
const tableName = computePucaTable(insert.tableName);
|
|
98
|
+
const args = applyWildCardStrategies({ args: insert.args, user });
|
|
98
99
|
const retorno = [
|
|
99
100
|
Object.assign(Object.assign({}, this.sqlBuilderService.insert({
|
|
100
101
|
tableName,
|
|
101
102
|
values: Object.assign({}, valuesPuca),
|
|
102
|
-
args
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
returning: [
|
|
106
|
-
insert.notify ? {
|
|
107
|
-
function: 'pg_notify',
|
|
108
|
-
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
109
|
-
} : null,
|
|
110
|
-
...(returningPuca || []),
|
|
111
|
-
].filter(f => f),
|
|
103
|
+
args,
|
|
104
|
+
where: insert.condition,
|
|
105
|
+
returning: returningPuca,
|
|
112
106
|
})), { commandName: 'insertPuca' }),
|
|
113
107
|
Object.assign(Object.assign({}, this.sqlBuilderService.insert({
|
|
114
108
|
tableName: computeUserTable(insert.tableName),
|
|
115
109
|
values: valuesUser,
|
|
116
|
-
args
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
returning: [
|
|
120
|
-
...(returningUser || [])
|
|
121
|
-
].filter(f => f),
|
|
110
|
+
args,
|
|
111
|
+
where: insert.condition,
|
|
112
|
+
returning: returningUser,
|
|
122
113
|
})), { commandName: 'insertUser' }),
|
|
123
114
|
].filter(r => r);
|
|
124
115
|
return retorno;
|
|
@@ -164,22 +155,16 @@ class SqlService {
|
|
|
164
155
|
!_.isEqual(setPuca, {})
|
|
165
156
|
? Object.assign(Object.assign({}, this.sqlBuilderService.update({
|
|
166
157
|
tableName: pucaTable,
|
|
167
|
-
args: Object.assign(
|
|
168
|
-
internal_change: `${update.tableName}.change`,
|
|
169
|
-
} : {})),
|
|
158
|
+
args: Object.assign({}, updateArgs),
|
|
170
159
|
set: setPuca,
|
|
171
160
|
where: {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
161
|
+
and: [{
|
|
162
|
+
v1: 'puca_pid',
|
|
163
|
+
operator: interfaces_1.ConditionalOpertator.equals,
|
|
164
|
+
v2: '$puca_pid',
|
|
165
|
+
}, update.where].filter(f => f)
|
|
175
166
|
},
|
|
176
|
-
returning:
|
|
177
|
-
update.notify ? {
|
|
178
|
-
function: 'pg_notify',
|
|
179
|
-
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
180
|
-
} : null,
|
|
181
|
-
...(returningPuca || []),
|
|
182
|
-
].filter(f => f),
|
|
167
|
+
returning: returningPuca,
|
|
183
168
|
})), { commandName: 'updatePuca' }) : null,
|
|
184
169
|
!_.isEqual(setUser, {})
|
|
185
170
|
? Object.assign(Object.assign({}, this.sqlBuilderService.update({
|
|
@@ -187,9 +172,13 @@ class SqlService {
|
|
|
187
172
|
args: Object.assign(Object.assign({}, updateArgs), { puca_pid: update.puca_pid }),
|
|
188
173
|
set: setUser,
|
|
189
174
|
where: {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
175
|
+
and: [{
|
|
176
|
+
v1: 'user_pid',
|
|
177
|
+
operator: interfaces_1.ConditionalOpertator.equals,
|
|
178
|
+
v2: '$puca_pid',
|
|
179
|
+
},
|
|
180
|
+
update.where
|
|
181
|
+
].filter(f => f)
|
|
193
182
|
},
|
|
194
183
|
returning: [
|
|
195
184
|
...returningUser || [],
|
|
@@ -215,15 +204,15 @@ class SqlService {
|
|
|
215
204
|
Object.assign(Object.assign({}, this.sqlBuilderService.delete({
|
|
216
205
|
tableName: userTable,
|
|
217
206
|
args: applyWildCardStrategies({
|
|
218
|
-
args: {
|
|
219
|
-
puca_pid: d.puca_pid,
|
|
220
|
-
},
|
|
207
|
+
args: Object.assign({ puca_pid: d.puca_pid }, d.args),
|
|
221
208
|
user,
|
|
222
209
|
}),
|
|
223
210
|
where: {
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
211
|
+
and: [{
|
|
212
|
+
v1: 'user_pid',
|
|
213
|
+
operator: interfaces_1.ConditionalOpertator.equals,
|
|
214
|
+
v2: '$puca_pid',
|
|
215
|
+
}, d.where].filter(f => f)
|
|
227
216
|
},
|
|
228
217
|
returning: [
|
|
229
218
|
...returningUser || [],
|
|
@@ -232,23 +221,17 @@ class SqlService {
|
|
|
232
221
|
Object.assign(Object.assign({}, this.sqlBuilderService.delete({
|
|
233
222
|
tableName: pucaTable,
|
|
234
223
|
args: applyWildCardStrategies({
|
|
235
|
-
args: Object.assign({ puca_pid: d.puca_pid },
|
|
236
|
-
internal_change: `${d.tableName}.change`,
|
|
237
|
-
} : {})),
|
|
224
|
+
args: Object.assign({ puca_pid: d.puca_pid }, d.args),
|
|
238
225
|
user,
|
|
239
226
|
}),
|
|
240
227
|
where: {
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
228
|
+
and: [{
|
|
229
|
+
v1: 'puca_pid',
|
|
230
|
+
operator: interfaces_1.ConditionalOpertator.equals,
|
|
231
|
+
v2: '$puca_pid',
|
|
232
|
+
}, d.where].filter(f => f)
|
|
244
233
|
},
|
|
245
|
-
returning:
|
|
246
|
-
d.notify ? {
|
|
247
|
-
function: 'pg_notify',
|
|
248
|
-
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
249
|
-
} : null,
|
|
250
|
-
...(returningPuca || []),
|
|
251
|
-
].filter(f => f),
|
|
234
|
+
returning: returningPuca,
|
|
252
235
|
})), { commandName: 'deletePuca' }),
|
|
253
236
|
];
|
|
254
237
|
return retorno;
|
|
@@ -265,5 +248,5 @@ class SqlService {
|
|
|
265
248
|
return Object.assign(Object.assign({}, this.sqlBuilderService.select(select)), { commandName: 'select' });
|
|
266
249
|
}
|
|
267
250
|
}
|
|
268
|
-
exports.
|
|
251
|
+
exports.CSqlService = CSqlService;
|
|
269
252
|
//# sourceMappingURL=sql.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql/sql.service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql/sql.service.ts"],"names":[],"mappings":";;;AAAA,iDAQ0B;AAC1B,4BAA4B;AAK5B,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC;AAC5D,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC;AAE5D,MAAM,kBAAkB,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAA0B,EAAE,EAAE;IACjE,OAAO;QACL;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,cAAc,CAAC;YAC9B,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,CAAC;SACF;QACD;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,kBAAkB,CAAC;YAClC,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,CAAC;SACF;QACD;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC;YACX,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAA6B,EAAE,EAAE;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,CAAC;YACD,kBAAkB,CAAC;gBACjB,IAAI;gBACJ,CAAC;aACF,CAAC;iBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;iBACpB,KAAK,EAAE;SACX,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACpB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACT,OAAO,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC,CAAC;AAWF,MAAa,WAAW;IACtB,YACmB,IAAiB,EACjB,iBAAoC;QADpC,SAAI,GAAJ,IAAI,CAAa;QACjB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IACL,MAAM,CACJ,MAGC,EACD,IAAU;QAMV,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;aAC7D,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACzE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,CAAC;gBACD,kBAAkB,CAAC;oBACjB,IAAI;oBACJ,CAAC;iBACF,CAAC;qBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;qBACpB,KAAK,EAAE;aACX,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC9D,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,UAAU,EAAE;gBACV,QAAQ;gBACR,eAAe,EAAE,GAAG;aACrB;YACD,UAAU,EAAE;gBACV,QAAQ,EAAE,QAAQ;aACnB;SACF,CACF,CAAC;QACJ,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,MAAM,CAAC,SAAS,IAAI,EAAE,CACvB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QACjE,MAAM,OAAO,GAAiB;4CAEvB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS;gBACT,MAAM,oBACD,UAAU,CACd;gBACD,IAAI;gBACJ,KAAK,EAAE,MAAM,CAAC,SAAS;gBACvB,SAAS,EAAE,aAAa;aACzB,CAAC,KACF,WAAW,EAAE,YAAY;4CAGtB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC7C,MAAM,EAAE,UAAU;gBAClB,IAAI;gBACJ,KAAK,EAAE,MAAM,CAAC,SAAS;gBACvB,SAAS,EAAE,aAAa;aACzB,CAAC,KACF,WAAW,EAAE,YAAY;SAsB5B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,MAEN,EAAE,IAAU;QACX,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,uBAAuB,CAAC;YACzC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI;SACL,CAAC,CAAC;QAEH,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;aACpD,MAAM,CACL,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACN,CAAC,CAAC,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CACvE;aACA,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,CAAC;gBACD,kBAAkB,CAAC;oBACjB,IAAI;oBACJ,CAAC;iBACF,CAAC;qBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;qBACpB,KAAK,EAAE;aACX,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACxD,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;SACZ,CACF,CAAC;QAEJ,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,MAAM,CAAC,SAAS,IAAI,EAAE,CACvB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,OAAO,GAAiB;YAC5B,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACrB,CAAC,iCACI,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;oBAC/B,SAAS,EAAE,SAAS;oBACpB,IAAI,oBACC,UAAU,CACd;oBACD,GAAG,EAAE,OAAO;oBACZ,KAAK,EAAE;wBACL,GAAG,EAAE,CAAC;gCACJ,EAAE,EAAE,UAAU;gCACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;gCACrC,EAAE,EAAE,WAAW;6BAChB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;qBAChC;oBACD,SAAS,EAAE,aAAa;iBACzB,CAAC,KACF,WAAW,EAAE,YAAY,IAE3B,CAAC,CAAC,IAAI;YACR,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACrB,CAAC,iCACI,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;oBAC/B,SAAS,EAAE,SAAS;oBACpB,IAAI,kCACC,UAAU,KACb,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAC1B;oBACD,GAAG,EAAE,OAAO;oBACZ,KAAK,EAAE;wBACL,GAAG,EAAE,CAAC;gCACJ,EAAE,EAAE,UAAU;gCACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;gCACrC,EAAE,EAAE,WAAW;6BAChB;4BACD,MAAM,CAAC,KAAK;yBACX,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;qBACjB;oBACD,SAAS,EAAE;wBACT,GAAG,aAAa,IAAI,EAAE;qBACvB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACjB,CAAC,KACF,WAAW,EAAE,YAAY,IAE3B,CAAC,CAAC,IAAI;SAmBT,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,CAGN,EAAE,IAAU;QACX,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,CAAC,CAAC,SAAS,IAAI,EAAE,CAClB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,OAAO,GAAiB;4CAEvB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,SAAS;gBACpB,IAAI,EAAE,uBAAuB,CAAC;oBAC5B,IAAI,kBACF,QAAQ,EAAE,CAAC,CAAC,QAAQ,IACjB,CAAC,CAAC,IAAI,CACV;oBACD,IAAI;iBACL,CAAC;gBACF,KAAK,EAAE;oBACL,GAAG,EAAE,CAAC;4BACJ,EAAE,EAAE,UAAU;4BACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;4BACrC,EAAE,EAAE,WAAW;yBAChB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBAC3B;gBACD,SAAS,EAAE;oBACT,GAAG,aAAa,IAAI,EAAE;iBACvB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC,KACF,WAAW,EAAE,YAAY;4CAGtB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,SAAS;gBACpB,IAAI,EAAE,uBAAuB,CAAC;oBAC5B,IAAI,kBACF,QAAQ,EAAE,CAAC,CAAC,QAAQ,IACjB,CAAC,CAAC,IAAI,CACV;oBACD,IAAI;iBACL,CAAC;gBACF,KAAK,EAAE;oBACL,GAAG,EAAE,CAAC;4BACJ,EAAE,EAAE,UAAU;4BACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;4BACrC,EAAE,EAAE,WAAW;yBAChB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBAC3B;gBACD,SAAS,EAAE,aAAa;aACzB,CAAC,KACF,WAAW,EAAE,YAAY;SAoB5B,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,cAAsB,EAAE,OAAa,IAAI;QAC9C,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE;YAC3D,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;SACnD;QACD,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,GAAG,uBAAuB,CAAC;YACpC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI;SACL,CAAC,CAAC;QACH,uCACK,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,KACxC,WAAW,EAAE,QAAQ,IACrB;IACJ,CAAC;CACF;AA1UD,kCA0UC"}
|
|
@@ -6,8 +6,7 @@ const numeric_sql_format_from_named_1 = require("../../plugins/numeric-sql-forma
|
|
|
6
6
|
const sql_escape_1 = require("../../plugins/sql-escape");
|
|
7
7
|
const helpers_1 = require("./helpers");
|
|
8
8
|
const _ = require("lodash");
|
|
9
|
-
const insertTemplate = (table, keys, values, returning) => `insert into ${table}(${keys}) values( ${
|
|
10
|
-
(returning ? `returning ${returning}` : '');
|
|
9
|
+
const insertTemplate = (table, keys, values, returning, where) => `insert into ${table}(${keys}) select ${values} ${where ? `where ${where}` : ''} ${(returning ? `returning ${returning}` : '')}`;
|
|
11
10
|
const deleteTemplate = (table, where, returning) => `delete from ${table} where ${where} ` +
|
|
12
11
|
(returning ? `returning ${returning}` : '');
|
|
13
12
|
const updateTemplate = {
|
|
@@ -39,7 +38,7 @@ class MutationService {
|
|
|
39
38
|
insert(insert) {
|
|
40
39
|
const safeInsert = sql_escape_1.default(insert);
|
|
41
40
|
const keys = Object.keys(safeInsert.values);
|
|
42
|
-
const sql = insertTemplate(safeInsert.tableName, list_as_string_1.default(keys, ', '), list_as_string_1.default(keys.map(k => `$${k}`), ', '), list_as_string_1.default(this.buildFields(safeInsert.returning), ', '));
|
|
41
|
+
const sql = insertTemplate(safeInsert.tableName, list_as_string_1.default(keys, ', '), list_as_string_1.default(keys.map(k => `$${k}`), ', '), list_as_string_1.default(this.buildFields(safeInsert.returning), ', '), this.selectService.buildWhere(safeInsert.where));
|
|
43
42
|
const normalizedValues = helpers_1.normalizeArgs(Object.assign(Object.assign({}, safeInsert.values), safeInsert.args));
|
|
44
43
|
const retorno = numeric_sql_format_from_named_1.default(sql, normalizedValues);
|
|
45
44
|
return retorno;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutation.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql-builder/mutation.service.ts"],"names":[],"mappings":";;;AACA,oEAA2D;AAC3D,+FAA2E;AAC3E,yDAAiD;AAEjD,uCAA0C;AAC1C,4BAA4B;
|
|
1
|
+
{"version":3,"file":"mutation.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql-builder/mutation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,31 +22,29 @@ class SelectService {
|
|
|
22
22
|
if (!where) {
|
|
23
23
|
return '1 = 1';
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
return whereTemplates.not(this.buildWhere(not));
|
|
25
|
+
if ('not' in where) {
|
|
26
|
+
return whereTemplates.not(this.buildWhere(where.not));
|
|
28
27
|
}
|
|
29
|
-
if (
|
|
30
|
-
const or =
|
|
31
|
-
if (
|
|
28
|
+
if ('or' in where) {
|
|
29
|
+
const or = where.or || [];
|
|
30
|
+
if (!or.length) {
|
|
32
31
|
return '1=1';
|
|
33
32
|
}
|
|
34
33
|
else {
|
|
35
34
|
return whereTemplates.or(or.map(orItem => this.buildWhere(orItem)));
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
|
-
if (
|
|
39
|
-
const and =
|
|
40
|
-
if (
|
|
37
|
+
if ('and' in where) {
|
|
38
|
+
const and = where.and || [];
|
|
39
|
+
if (!and.length) {
|
|
41
40
|
return '1=1';
|
|
42
41
|
}
|
|
43
42
|
else {
|
|
44
43
|
return whereTemplates.and(and.map(andItem => this.buildWhere(andItem)));
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
const select = this.selectText(exists);
|
|
46
|
+
if ('exists' in where) {
|
|
47
|
+
const select = this.selectText(where.exists);
|
|
50
48
|
return whereTemplates.exists(select);
|
|
51
49
|
}
|
|
52
50
|
const estrategies = [
|
|
@@ -72,11 +70,11 @@ class SelectService {
|
|
|
72
70
|
},
|
|
73
71
|
];
|
|
74
72
|
const v1 = estrategies
|
|
75
|
-
.find(({ apply }) => apply(
|
|
76
|
-
.exec(
|
|
73
|
+
.find(({ apply }) => apply(where.v1))
|
|
74
|
+
.exec(where.v1);
|
|
77
75
|
const v2 = estrategies
|
|
78
|
-
.find(({ apply }) => apply(
|
|
79
|
-
.exec(
|
|
76
|
+
.find(({ apply }) => apply(where.v2))
|
|
77
|
+
.exec(where.v2);
|
|
80
78
|
const retorno = {
|
|
81
79
|
equals: () => `${v1} = ${v2}`,
|
|
82
80
|
less: () => `${v1} < ${v2}`,
|
|
@@ -89,8 +87,8 @@ class SelectService {
|
|
|
89
87
|
startsWith: () => `${v1} like ${v2} || '%'`,
|
|
90
88
|
endsWith: () => `${v1} like '%' || ${v2}`,
|
|
91
89
|
isNull: () => `nullif( ${v1}::varchar, '') is null`,
|
|
92
|
-
}[
|
|
93
|
-
return retorno;
|
|
90
|
+
}[where.operator]();
|
|
91
|
+
return where.comment ? `(/*${where.comment}*/ ${retorno})` : retorno;
|
|
94
92
|
}
|
|
95
93
|
buildField(field, autoIncludeAlias) {
|
|
96
94
|
if (_.get(field, 'function')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql-builder/select.service.ts"],"names":[],"mappings":";;;AAAA,iDAO0B;AAE1B,yDAAiD;AACjD,4BAA4B;AAC5B,oEAA2D;AAC3D,+FAA2E;AAC3E,uCAA0C;AAE1C,MAAM,YAAY,GAAG,CACnB,QAAgB,EAChB,KAAa,EACb,KAAa,EACb,KAAa,EACb,EAAE,CAAC,GAAG,QAAQ,SAAS,KAAK,IAAI,KAAK,OAAO,KAAK,EAAE,CAAC;AAEtD,MAAM,cAAc,GAAG,CACrB,MAAc,EACd,IAAY,EACZ,IAAY,EACZ,KAAa,EACb,OAAe,EACf,OAAe,EACf,KAAa,EACb,MAAc,EACd,EAAE,CACF,UAAU,MAAM,SAAS,IAAI,IAAI,IAAI,YAAY,KAAK,MAAM,OAAO,IAAI,OAAO,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;AACtG,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,YAAY,MAAM,EAAE,CAAC;AACjE,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,YAAY,MAAM,EAAE,CAAC;AAEjE,MAAM,cAAc,GAAG;IACrB,GAAG,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,KAAK,wBAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI;IAC7D,EAAE,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,KAAK,wBAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI;IAC3D,MAAM,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,UAAU,MAAM,GAAG;IAC/C,GAAG,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,KAAK;CAC5C,CAAC;AAEF,MAAa,aAAa;IACxB,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,OAAO,CAAC;SAChB;QACD,
|
|
1
|
+
{"version":3,"file":"select.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql-builder/select.service.ts"],"names":[],"mappings":"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"}
|
package/dist/orm/interfaces.d.ts
CHANGED
|
@@ -52,12 +52,13 @@ export declare enum AscDesc {
|
|
|
52
52
|
export declare type OrderByField = {
|
|
53
53
|
sort?: AscDesc;
|
|
54
54
|
} & SelectField;
|
|
55
|
+
export declare type From = {
|
|
56
|
+
table: string;
|
|
57
|
+
alias: string;
|
|
58
|
+
} | string;
|
|
55
59
|
export interface Select {
|
|
56
60
|
fields?: SelectField[];
|
|
57
|
-
from:
|
|
58
|
-
table: string;
|
|
59
|
-
alias: string;
|
|
60
|
-
} | string;
|
|
61
|
+
from: From;
|
|
61
62
|
join?: Join[];
|
|
62
63
|
where?: Where;
|
|
63
64
|
args?: Object;
|
|
@@ -67,6 +68,7 @@ export interface Select {
|
|
|
67
68
|
groupBy?: SelectField[];
|
|
68
69
|
}
|
|
69
70
|
export interface WhereOperator {
|
|
71
|
+
comment?: string;
|
|
70
72
|
v1: SelectField;
|
|
71
73
|
operator: ConditionalOpertator;
|
|
72
74
|
v2?: SelectField;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { SqlService } from './sql.service';
|
|
1
2
|
import { RepositoryFactory } from './repository-factory';
|
|
2
3
|
import { DatabaseManagerService } from './managers/database-manager.service';
|
|
3
4
|
import { RedisManagerService } from './managers/redis-manager.service';
|
|
4
5
|
export declare const databaseManagerService: DatabaseManagerService;
|
|
5
6
|
export declare const redisManagerService: RedisManagerService;
|
|
6
|
-
export declare
|
|
7
|
+
export declare let repositoryFactory: RepositoryFactory;
|
|
8
|
+
export declare const sqlService: SqlService;
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.repositoryFactory = exports.redisManagerService = exports.databaseManagerService = void 0;
|
|
3
|
+
exports.sqlService = exports.repositoryFactory = exports.redisManagerService = exports.databaseManagerService = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
|
-
const
|
|
5
|
+
const sql_service_1 = require("./sql.service");
|
|
6
6
|
const repository_factory_1 = require("./repository-factory");
|
|
7
7
|
const database_manager_service_1 = require("./managers/database-manager.service");
|
|
8
8
|
const essential_1 = require("../../essential");
|
|
9
9
|
const redis_manager_service_1 = require("./managers/redis-manager.service");
|
|
10
|
+
const cases_1 = require("../cases");
|
|
10
11
|
exports.databaseManagerService = new database_manager_service_1.DatabaseManagerService();
|
|
11
12
|
exports.redisManagerService = new redis_manager_service_1.RedisManagerService();
|
|
12
|
-
exports.
|
|
13
|
+
exports.sqlService = new sql_service_1.SqlService(cases_1.cSqlService, () => exports.repositoryFactory);
|
|
14
|
+
exports.repositoryFactory = new repository_factory_1.RepositoryFactory(exports.databaseManagerService, exports.redisManagerService, () => exports.sqlService, plugins_1.uuidService, essential_1.envConfigService);
|
|
13
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orm/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAC5C
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orm/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAC5C,+CAA2C;AAC3C,6DAAyD;AACzD,kFAA6E;AAC7E,+CAAmD;AACnD,4EAAuE;AACvE,oCAAuC;AAE1B,QAAA,sBAAsB,GAAG,IAAI,iDAAsB,EAAE,CAAC;AACtD,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;AAIhD,QAAA,UAAU,GAAG,IAAI,wBAAU,CAAC,mBAAW,EAAE,GAAG,EAAE,CAAC,yBAAiB,CAAC,CAAA;AAE9E,yBAAiB,GAAG,IAAI,sCAAiB,CACvC,8BAAsB,EACtB,2BAAmB,EACnB,GAAG,EAAE,CAAC,kBAAU,EAChB,qBAAW,EACX,4BAAgB,CACjB,CAAC"}
|
|
@@ -22,7 +22,21 @@ class Database {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
query(sqlCommandList, opt) {
|
|
25
|
-
sqlCommandList.forEach(sqlCommand =>
|
|
25
|
+
sqlCommandList.forEach(sqlCommand => {
|
|
26
|
+
this.logger.verbose(() => {
|
|
27
|
+
let sql = sqlCommand.sql;
|
|
28
|
+
const args = sqlCommand.args || [];
|
|
29
|
+
args.map((arg, i) => {
|
|
30
|
+
return { arg, i: i + 1 };
|
|
31
|
+
}).reverse().forEach(({ arg, i }) => {
|
|
32
|
+
const text = `$${i}`;
|
|
33
|
+
while (sql.includes(text)) {
|
|
34
|
+
sql = sql.replace(text, !arg || (typeof arg === 'boolean') ? arg : `'${arg}'`);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
return sql;
|
|
38
|
+
});
|
|
39
|
+
});
|
|
26
40
|
return this.pucaOrmClient.query(sqlCommandList.map(sqlCommand => ({
|
|
27
41
|
name: sqlCommand.commandName,
|
|
28
42
|
text: sqlCommand.sql,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,0DAAuD;AACvD,uEAAiH;AAIjH,MAAa,QAAQ;IAInB,YAAY,MAA+B;QAH1B,WAAM,GAAG,IAAI,eAAM,CAAC,UAAU,CAAC,CAAC;QAI/C,IAAI,CAAC,aAAa,GAAG,IAAI,uCAAa,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI;YACF,MAAM,IAAI,CAAC,IAAI,CAAC;gBACd,GAAG,EAAE,cAAc;gBACnB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;IACH,CAAC;IAEO,KAAK,CAAC,cAA4B,EAAE,GAAoB;QAC9D,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,10 +48,8 @@ class PucaOrmClient {
|
|
|
48
48
|
return reject(err.message || err);
|
|
49
49
|
}
|
|
50
50
|
if (res.error) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
return reject(new Error(res.error.message || 'Generic Error'));
|
|
51
|
+
this.logger.error(commandList, res.error);
|
|
52
|
+
return reject(res.error.message || 'Generic Error');
|
|
55
53
|
}
|
|
56
54
|
(res.result || []).forEach(r => {
|
|
57
55
|
(r.result || []).forEach((v, i) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puca-orm-client.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/puca-orm-client.service.ts"],"names":[],"mappings":";;;AAAA,2CAA2G;AAE3G,qDAA8C;AAC9C,0DAAuD;AA4BvD,MAAa,aAAa;IASxB,YAA6B,MAA+B;QAA/B,WAAM,GAAN,MAAM,CAAyB;QAR3C,WAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,CAAA;QAK7C,mBAAc,GAAG,CAAC,CAAA;QACT,YAAO,GAA6B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAG/D,MAAM,GAAG,GAAG,+BAAqB,CAC/B,uBAAQ,CACN,GAAG,OAAO,CAAC,GAAG,EAAE,+CAA+C,EAAE;YACjE,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,IAAI;SACb,CACA,CACF,CAAA;QAED,IAAI,CAAC,MAAM,GAAI,GAAG,CAAC,IAAY,CAAC,UAAU,CAAA;QAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACjC,WAAW,CAAC,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,YAAY,EAAE,CAAA;QACrB,CAAC,EAAE,KAAK,CAAC,CAAA;QAET,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAQ,EAAE,CAAA;QAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,WAIT,EAAE,GAAoB;QACvB,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC3C,CAAC,CAAC,KAAK,EAAE,CAAA;QACT,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpD,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC5B,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBACtC,IAAI,CAAC,KAAK,SAAS,EAAE;wBACnB,CAAC,GAAG,IAAI,CAAA;qBACT;oBACD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;gBACvC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YACF,CAAC,CAAC,MAAM,CAAC,KAAK,CACZ;gBACE,WAAW;gBACX,GAAG;aACJ,EACD,IAAI,CAAC,QAAQ,EACb,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACX,CAAC,CAAC,KAAK,EAAE,CAAA;gBACT,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAA;iBAClC;gBAED,IAAI,GAAG,CAAC,KAAK,EAAE;oBACb,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"puca-orm-client.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/puca-orm-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
2
2
|
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
3
|
-
import { SqlService } from '../
|
|
3
|
+
import { SqlService } from '../services/sql.service';
|
|
4
4
|
import { CacheRepository } from './cache-repository/cache-repository';
|
|
5
5
|
import { DatabaseManagerService } from './managers/database-manager.service';
|
|
6
6
|
import { RedisManagerService } from './managers/redis-manager.service';
|
|
@@ -12,12 +12,12 @@ export interface CacheInstanceList {
|
|
|
12
12
|
export declare class RepositoryFactory {
|
|
13
13
|
private readonly databaseManagerService;
|
|
14
14
|
private readonly redisManagerService;
|
|
15
|
-
private readonly
|
|
15
|
+
private readonly funcSqlService;
|
|
16
16
|
private readonly uuidService;
|
|
17
17
|
private readonly envConfigService;
|
|
18
18
|
private readonly instances;
|
|
19
19
|
private readonly cacheInstances;
|
|
20
|
-
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService,
|
|
20
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, funcSqlService: () => SqlService, uuidService: UuidService, envConfigService: EnvConfigService);
|
|
21
21
|
getInstance<T>({ tableName, }: {
|
|
22
22
|
tableName: string;
|
|
23
23
|
}): Repository<T>;
|
|
@@ -4,10 +4,10 @@ exports.RepositoryFactory = void 0;
|
|
|
4
4
|
const cache_repository_1 = require("./cache-repository/cache-repository");
|
|
5
5
|
const repository_1 = require("./repository");
|
|
6
6
|
class RepositoryFactory {
|
|
7
|
-
constructor(databaseManagerService, redisManagerService,
|
|
7
|
+
constructor(databaseManagerService, redisManagerService, funcSqlService, uuidService, envConfigService) {
|
|
8
8
|
this.databaseManagerService = databaseManagerService;
|
|
9
9
|
this.redisManagerService = redisManagerService;
|
|
10
|
-
this.
|
|
10
|
+
this.funcSqlService = funcSqlService;
|
|
11
11
|
this.uuidService = uuidService;
|
|
12
12
|
this.envConfigService = envConfigService;
|
|
13
13
|
this.instances = {};
|
|
@@ -15,7 +15,7 @@ class RepositoryFactory {
|
|
|
15
15
|
}
|
|
16
16
|
getInstance({ tableName, }) {
|
|
17
17
|
if (!this.instances[tableName]) {
|
|
18
|
-
this.instances[tableName] = new repository_1.Repository(this.databaseManagerService.get(), this.redisManagerService.get(), this.
|
|
18
|
+
this.instances[tableName] = new repository_1.Repository(this.databaseManagerService.get(), this.redisManagerService.get(), this.funcSqlService, this.uuidService, tableName);
|
|
19
19
|
}
|
|
20
20
|
return this.instances[tableName];
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository-factory.js","sourceRoot":"","sources":["../../../src/orm/services/repository-factory.ts"],"names":[],"mappings":";;;AAGA,0EAAsE;AAGtE,6CAA0C;AAK1C,MAAa,iBAAiB;IAQ5B,YACmB,sBAA8C,EAC9C,mBAAwC,EACxC,
|
|
1
|
+
{"version":3,"file":"repository-factory.js","sourceRoot":"","sources":["../../../src/orm/services/repository-factory.ts"],"names":[],"mappings":";;;AAGA,0EAAsE;AAGtE,6CAA0C;AAK1C,MAAa,iBAAiB;IAQ5B,YACmB,sBAA8C,EAC9C,mBAAwC,EACxC,cAAgC,EAChC,WAAwB,EACxB,gBAAkC;QAJlC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAkB;QAChC,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAZpC,cAAS,GAEtB,EAAE,CAAC;QACU,mBAAc,GAE3B,EAAE,CAAC;IAQH,CAAC;IAEL,WAAW,CAAI,EACb,SAAS,GAGV;QACC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;YAC9B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,IAAI,uBAAU,CACxC,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,EACjC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAC9B,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,WAAW,EAChB,SAAS,CACV,CAAC;SACH;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IACD,gBAAgB,CAAkC,EAChD,SAAS,GAGV;QACC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YACnC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,kCAAe,CAClD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,EACjC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAC9B,SAAS,CACV,CAAC;SACH;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE;YACjF,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAA;QAClC,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;CACF;AApDD,8CAoDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Join, OrderByField, SelectField, SelectResult, Where } from '../interfaces';
|
|
2
2
|
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
3
3
|
import { User } from '../../models/user';
|
|
4
|
-
import { SqlService } from '
|
|
4
|
+
import { SqlService } from './sql.service';
|
|
5
5
|
import { Database } from './managers/database-manager.service';
|
|
6
6
|
import { RedisClient } from 'redis';
|
|
7
7
|
export declare enum TotalizeMode {
|
|
@@ -96,11 +96,11 @@ export declare class Repository<T extends {
|
|
|
96
96
|
}> {
|
|
97
97
|
private readonly database;
|
|
98
98
|
private readonly redisClient;
|
|
99
|
-
private readonly
|
|
99
|
+
private readonly sqlServiceFunc;
|
|
100
100
|
private readonly uuidService;
|
|
101
101
|
private readonly table;
|
|
102
102
|
private readonly log;
|
|
103
|
-
constructor(database: Database, redisClient: RedisClient,
|
|
103
|
+
constructor(database: Database, redisClient: RedisClient, sqlServiceFunc: () => SqlService, uuidService: UuidService, table: string);
|
|
104
104
|
findByIn({ key, values, fields, orderBy, user, alias, totalizeMode, }: FindByInArgs): Promise<T[]>;
|
|
105
105
|
findByPucaPid({ pucaPid, fields, user, alias }: FindByPucaPidArgs): Promise<T>;
|
|
106
106
|
findOneBy(args: FindOneByArgs): Promise<T>;
|