@qrvey/data-persistence 0.0.6-7.2 → 0.1.0
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/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js +14 -6
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js +2 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js +28 -32
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js +8 -8
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -155,10 +155,10 @@ class DynamoDbCrudService {
|
|
|
155
155
|
const operator = constants_1.FILTER_OPERATOR_MAP[(_b = (_a = filter.operator) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : constants_1.DYNAMODB_OPERATORS.EQUAL];
|
|
156
156
|
query.where(filter.attribute)[operator](filter.value);
|
|
157
157
|
}
|
|
158
|
-
applyFilterFilter(query, filter, logicOperator = 'AND') {
|
|
158
|
+
applyFilterFilter(query, filter, logicOperator = 'AND', config) {
|
|
159
159
|
var _a, _b;
|
|
160
160
|
const operator = constants_1.FILTER_OPERATOR_MAP[(_b = (_a = filter.operator) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : constants_1.DYNAMODB_OPERATORS.EQUAL];
|
|
161
|
-
query.filter(filter.attribute, logicOperator)[operator](filter.value);
|
|
161
|
+
query.filter(filter.attribute, logicOperator, config)[operator](filter.value);
|
|
162
162
|
}
|
|
163
163
|
applyFilters(query, options) {
|
|
164
164
|
if (Array.isArray(options.filters)) {
|
|
@@ -188,7 +188,7 @@ class DynamoDbCrudService {
|
|
|
188
188
|
return;
|
|
189
189
|
this.buildFilterExpression(query, options);
|
|
190
190
|
}
|
|
191
|
-
buildFilterExpression(query, options) {
|
|
191
|
+
buildFilterExpression(query, options, parentKey) {
|
|
192
192
|
var _a;
|
|
193
193
|
const compositeFilters = options.filters;
|
|
194
194
|
const queryIndexColumns = ((_a = options.index) === null || _a === void 0 ? void 0 : _a.columns) || [];
|
|
@@ -197,18 +197,26 @@ class DynamoDbCrudService {
|
|
|
197
197
|
? queryIndexColumns
|
|
198
198
|
: defaultWhereProperties;
|
|
199
199
|
for (const [key, value] of Object.entries(compositeFilters)) {
|
|
200
|
-
value.forEach((filter) => {
|
|
200
|
+
value.forEach((filter, index) => {
|
|
201
201
|
const isCompositeFilter = 'OR' in filter || 'AND' in filter;
|
|
202
202
|
if (isCompositeFilter) {
|
|
203
203
|
const newOptions = Object.assign(Object.assign({}, options), { filters: filter });
|
|
204
|
-
this.buildFilterExpression(query, newOptions);
|
|
204
|
+
this.buildFilterExpression(query, newOptions, key);
|
|
205
205
|
}
|
|
206
206
|
else {
|
|
207
207
|
const simpleFilter = filter;
|
|
208
208
|
const isWhereProperty = whereProperties.includes(simpleFilter.attribute);
|
|
209
|
+
let config;
|
|
210
|
+
if (parentKey) {
|
|
211
|
+
config = {
|
|
212
|
+
parentKey,
|
|
213
|
+
openExpression: index === 0,
|
|
214
|
+
closeExpression: index === value.length - 1,
|
|
215
|
+
};
|
|
216
|
+
}
|
|
209
217
|
isWhereProperty && !options.useScan
|
|
210
218
|
? this.applyWhereFilter(query, simpleFilter)
|
|
211
|
-
: this.applyFilterFilter(query, simpleFilter, key);
|
|
219
|
+
: this.applyFilterFilter(query, simpleFilter, key, config);
|
|
212
220
|
}
|
|
213
221
|
});
|
|
214
222
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamoDbCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbCrud.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dynamoDbCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbCrud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,10 +57,11 @@ class QueryBuilderService {
|
|
|
57
57
|
.from(queryHelpers_1.METHOD_TO_QUERY.where);
|
|
58
58
|
return this.condition;
|
|
59
59
|
}
|
|
60
|
-
filter(keyName, logicOperator = 'AND') {
|
|
60
|
+
filter(keyName, logicOperator = 'AND', config) {
|
|
61
61
|
this.condition
|
|
62
62
|
.setKey(keyName)
|
|
63
63
|
.setTmpLogicOp(logicOperator)
|
|
64
|
+
.setConfig(config)
|
|
64
65
|
.from(queryHelpers_1.METHOD_TO_QUERY.filter);
|
|
65
66
|
return this.condition;
|
|
66
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilder.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilder.service.ts"],"names":[],"mappings":";;;;;AAEA,oGAA2E;AAC3E,gEAAgE;AAEhE,wDAA+D;AAE/D,MAAqB,mBAAmB;IAIpC,YAAoB,UAAU,KAAK;QAAf,YAAO,GAAP,OAAO,CAAQ;QAC/B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC,SAAS,GAAG,IAAI,uCAA4B,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,GAAG;QACC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACvC,uCAAY,IAAI,CAAC,OAAO,GAAK,SAAS,EAAG;IAC7C,CAAC;IAED,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,SAAiB;QACxB,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS;QACL,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU;QACN,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,8DAA8D;IAC9D,QAAQ,CAAC,gBAAqC;QAC1C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAClD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,SAAmB,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEhC,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACrB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAe;QACjB,IAAI,CAAC,SAAS;aACT,MAAM,CAAC,OAAO,CAAC;aACf,aAAa,CAAC,IAAI,CAAC;aACnB,IAAI,CAAC,8BAAe,CAAC,KAAK,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CACF,OAAe,EACf,gBAAwB,KAAK;
|
|
1
|
+
{"version":3,"file":"queryBuilder.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilder.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,10 @@ class QueryBuilderConditionService {
|
|
|
26
26
|
this.tempLogicOperator = logicOp;
|
|
27
27
|
return this;
|
|
28
28
|
}
|
|
29
|
+
setConfig(config) {
|
|
30
|
+
this.config = config;
|
|
31
|
+
return this;
|
|
32
|
+
}
|
|
29
33
|
from(methodName) {
|
|
30
34
|
this.queryFrom = methodName;
|
|
31
35
|
return this;
|
|
@@ -34,7 +38,7 @@ class QueryBuilderConditionService {
|
|
|
34
38
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
35
39
|
let expression = `${key} = ${value}`;
|
|
36
40
|
if (this.tempLogicOperator)
|
|
37
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
41
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
38
42
|
this.setExpression(expression);
|
|
39
43
|
return this.query;
|
|
40
44
|
}
|
|
@@ -42,7 +46,7 @@ class QueryBuilderConditionService {
|
|
|
42
46
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
43
47
|
let expression = `${key} <> ${value}`;
|
|
44
48
|
if (this.tempLogicOperator)
|
|
45
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
49
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
46
50
|
this.setExpression(expression);
|
|
47
51
|
return this.query;
|
|
48
52
|
}
|
|
@@ -50,7 +54,7 @@ class QueryBuilderConditionService {
|
|
|
50
54
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
51
55
|
let expression = `contains(${key}, ${value})`;
|
|
52
56
|
if (this.tempLogicOperator)
|
|
53
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
57
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
54
58
|
this.setExpression(expression);
|
|
55
59
|
return this.query;
|
|
56
60
|
}
|
|
@@ -58,7 +62,7 @@ class QueryBuilderConditionService {
|
|
|
58
62
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
59
63
|
let expression = `NOT contains(${key}, ${value})`;
|
|
60
64
|
if (this.tempLogicOperator)
|
|
61
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
65
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
62
66
|
this.setExpression(expression);
|
|
63
67
|
return this.query;
|
|
64
68
|
}
|
|
@@ -67,7 +71,7 @@ class QueryBuilderConditionService {
|
|
|
67
71
|
const { key, value } = this.generateKeyValue(keyValues);
|
|
68
72
|
let expression = `${key} IN (${value})`;
|
|
69
73
|
if (this.tempLogicOperator)
|
|
70
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
74
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
71
75
|
this.setExpression(expression);
|
|
72
76
|
return this.query;
|
|
73
77
|
}
|
|
@@ -75,7 +79,7 @@ class QueryBuilderConditionService {
|
|
|
75
79
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
76
80
|
let expression = `begins_with(${key}, ${value})`;
|
|
77
81
|
if (this.tempLogicOperator)
|
|
78
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
82
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
79
83
|
this.setExpression(expression);
|
|
80
84
|
return this.query;
|
|
81
85
|
}
|
|
@@ -88,7 +92,7 @@ class QueryBuilderConditionService {
|
|
|
88
92
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
89
93
|
let expression = `${key} > ${value}`;
|
|
90
94
|
if (this.tempLogicOperator)
|
|
91
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
95
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
92
96
|
this.setExpression(expression);
|
|
93
97
|
return this.query;
|
|
94
98
|
}
|
|
@@ -96,7 +100,7 @@ class QueryBuilderConditionService {
|
|
|
96
100
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
97
101
|
let expression = `${key} >= ${value}`;
|
|
98
102
|
if (this.tempLogicOperator)
|
|
99
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
103
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
100
104
|
this.setExpression(expression);
|
|
101
105
|
return this.query;
|
|
102
106
|
}
|
|
@@ -104,7 +108,7 @@ class QueryBuilderConditionService {
|
|
|
104
108
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
105
109
|
let expression = `${key} <= ${value}`;
|
|
106
110
|
if (this.tempLogicOperator)
|
|
107
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
111
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
108
112
|
this.setExpression(expression);
|
|
109
113
|
return this.query;
|
|
110
114
|
}
|
|
@@ -112,7 +116,7 @@ class QueryBuilderConditionService {
|
|
|
112
116
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
113
117
|
let expression = `${key} < ${value}`;
|
|
114
118
|
if (this.tempLogicOperator)
|
|
115
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
119
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
116
120
|
this.setExpression(expression);
|
|
117
121
|
return this.query;
|
|
118
122
|
}
|
|
@@ -120,7 +124,7 @@ class QueryBuilderConditionService {
|
|
|
120
124
|
const { key } = this.generateKeyValue(keyValue, null, true);
|
|
121
125
|
let expression = `attribute_exists(${key})`;
|
|
122
126
|
if (this.tempLogicOperator)
|
|
123
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
127
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
124
128
|
this.setExpression(expression);
|
|
125
129
|
return this.query;
|
|
126
130
|
}
|
|
@@ -128,7 +132,7 @@ class QueryBuilderConditionService {
|
|
|
128
132
|
const { key } = this.generateKeyValue(keyValue, null, true);
|
|
129
133
|
let expression = `attribute_not_exists(${key})`;
|
|
130
134
|
if (this.tempLogicOperator)
|
|
131
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
135
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
132
136
|
this.setExpression(expression);
|
|
133
137
|
return this.query;
|
|
134
138
|
}
|
|
@@ -139,7 +143,7 @@ class QueryBuilderConditionService {
|
|
|
139
143
|
const { key, value } = this.generateKeyValue(keyValues, ' AND');
|
|
140
144
|
let expression = `${key} between ${value}`;
|
|
141
145
|
if (this.tempLogicOperator)
|
|
142
|
-
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
146
|
+
expression = { expression, logicOperator: this.tempLogicOperator, config: this.config };
|
|
143
147
|
this.setExpression(expression);
|
|
144
148
|
return this.query;
|
|
145
149
|
}
|
|
@@ -195,32 +199,24 @@ class QueryBuilderConditionService {
|
|
|
195
199
|
}
|
|
196
200
|
if (this.filters.length > 0) {
|
|
197
201
|
let filterExpression = '';
|
|
198
|
-
let previousOperator;
|
|
199
|
-
const lengthFilters = this.filters.length;
|
|
200
|
-
let flagOpen = false;
|
|
201
202
|
(_a = this.filters) === null || _a === void 0 ? void 0 : _a.forEach((filter, index) => {
|
|
203
|
+
var _a, _b;
|
|
202
204
|
if (filter === null || filter === void 0 ? void 0 : filter.logicOperator) {
|
|
203
|
-
if (
|
|
204
|
-
|
|
205
|
-
filterExpression
|
|
206
|
-
|
|
205
|
+
if ((_a = filter === null || filter === void 0 ? void 0 : filter.config) === null || _a === void 0 ? void 0 : _a.openExpression) {
|
|
206
|
+
filterExpression = filterExpression.replace(/\s+(AND|OR)\s*$/, ` ${filter.config.parentKey} (`);
|
|
207
|
+
if (filterExpression === '')
|
|
208
|
+
filterExpression += '(';
|
|
209
|
+
filterExpression += `${filter.expression} ${filter.logicOperator} `;
|
|
207
210
|
}
|
|
208
|
-
else {
|
|
209
|
-
filterExpression += `${filter.expression} `;
|
|
210
|
-
if (flagOpen) {
|
|
211
|
-
filterExpression += `)`;
|
|
212
|
-
flagOpen = false;
|
|
213
|
-
}
|
|
211
|
+
else if ((_b = filter === null || filter === void 0 ? void 0 : filter.config) === null || _b === void 0 ? void 0 : _b.closeExpression) {
|
|
212
|
+
filterExpression += `${filter.expression}) ${filter.config.parentKey} `;
|
|
214
213
|
}
|
|
215
|
-
|
|
216
|
-
filterExpression += `${filter.logicOperator} `;
|
|
217
|
-
}
|
|
218
|
-
else if (index === lengthFilters - 1 && flagOpen) {
|
|
219
|
-
filterExpression += `)`;
|
|
214
|
+
else {
|
|
215
|
+
filterExpression += `${filter.expression} ${filter.logicOperator} `;
|
|
220
216
|
}
|
|
221
|
-
previousOperator = filter === null || filter === void 0 ? void 0 : filter.logicOperator;
|
|
222
217
|
}
|
|
223
218
|
});
|
|
219
|
+
filterExpression = filterExpression.replace(/\s+(AND|OR)\s*$/, '');
|
|
224
220
|
this.command['FilterExpression'] = filterExpression;
|
|
225
221
|
}
|
|
226
222
|
if (this.updates.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilderCondition.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilderCondition.service.ts"],"names":[],"mappings":";;AAIA,gEAAgE;AAGhE,MAAqB,4BAA4B;
|
|
1
|
+
{"version":3,"file":"queryBuilderCondition.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilderCondition.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,31 +44,31 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
44
44
|
if (!postgresOperator)
|
|
45
45
|
throw new Error(`Unsupported filter operator: ${operator}`);
|
|
46
46
|
const filterProperty = pg_format_1.default.ident(attribute);
|
|
47
|
+
const columnExists = !!this.crudSchema.columns[attribute];
|
|
48
|
+
const property = columnExists
|
|
49
|
+
? filterProperty
|
|
50
|
+
: `("qvAttributes" ->> '${attribute}')`;
|
|
47
51
|
if (operator === constants_1.FilterOperator.IN) {
|
|
48
52
|
const formattedValues = Array.isArray(value)
|
|
49
53
|
? value.map(pg_format_1.default.literal)
|
|
50
54
|
: [formattedValue];
|
|
51
|
-
return `${
|
|
55
|
+
return `${property} ${postgresOperator} (${formattedValues.join(', ')})`;
|
|
52
56
|
}
|
|
53
57
|
if (operator === constants_1.FilterOperator.BETWEEN) {
|
|
54
|
-
return `${
|
|
58
|
+
return `${property} ${postgresOperator} ${value[0]} AND ${value[1]}`;
|
|
55
59
|
}
|
|
56
60
|
/**
|
|
57
61
|
* ? Additional filter to avoid error when column accepts null values.
|
|
58
62
|
*/
|
|
59
63
|
if (operator === constants_1.FilterOperator.NOT_EQUAL && value !== null) {
|
|
60
|
-
return `(${
|
|
64
|
+
return `(${property} ${postgresOperator} ${pg_format_1.default.literal(value)} OR ${property} IS NULL)`;
|
|
61
65
|
}
|
|
62
66
|
if (operator === constants_1.FilterOperator.NOT_EXIST ||
|
|
63
67
|
operator === constants_1.FilterOperator.EXIST) {
|
|
64
|
-
const columnExists = !!this.crudSchema.columns[attribute];
|
|
65
|
-
const property = columnExists
|
|
66
|
-
? filterProperty
|
|
67
|
-
: `("qvAttributes" ->> '${attribute}')`;
|
|
68
68
|
return `${property} ${postgresOperator}`;
|
|
69
69
|
}
|
|
70
70
|
const wildcardValue = this.getWildcardValue(operator, value);
|
|
71
|
-
return `${
|
|
71
|
+
return `${property} ${postgresOperator} ${pg_format_1.default.literal(wildcardValue)}`;
|
|
72
72
|
}
|
|
73
73
|
buildFilterClause(filters, logicOperator) {
|
|
74
74
|
if (Array.isArray(filters)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,+BAA+B;;;;;AAE/B,0DAA+B;AAU/B,oEAA2C;AAC3C,wDAMkC;AAElC,8DAA4D;AAC5D,gEAAsE;AAEtE,MAAqB,uBAA2B,SAAQ,uBAAY;IAEhE,YAAY,WAA8B;QACtC,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,IAAI,KAAK,CAAC;QACvD,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,6BAAiB,CAAC;IACvD,CAAC;IAED,IAAI,SAAS;QACT,OAAO,CACH,IAAA,0BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC;YAC5C,IAAA,0BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CACtC,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,QAAwB,EAAE,KAAa;QACpD,IACI,QAAQ,KAAK,0BAAc,CAAC,QAAQ;YACpC,QAAQ,KAAK,0BAAc,CAAC,YAAY,EAC1C;YACE,OAAO,GAAG,GAAG,KAAK,GAAG,GAAG,CAAC;SAC5B;aAAM,IAAI,QAAQ,KAAK,0BAAc,CAAC,WAAW,EAAE;YAChD,OAAO,KAAK,GAAG,GAAG,CAAC;SACtB;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAEO,WAAW,CACf,QAAwB,EACxB,SAAiB,EACjB,KAAU;QAEV,MAAM,cAAc,GAAG,mBAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7C,QAAQ,GAAG,QAAQ;YACf,CAAC,CAAE,QAAQ,CAAC,WAAW,EAAqB;YAC5C,CAAC,CAAC,0BAAc,CAAC,KAAK,CAAC;QAC3B,MAAM,gBAAgB,GAAG,wCAA4B,CAAC,QAAQ,CAAC,CAAC;QAEhE,IAAI,CAAC,gBAAgB;YACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,EAAE,CAAC,CAAC;QAEhE,MAAM,cAAc,GAAG,mBAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":"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"}
|