@qrvey/data-persistence 0.1.3 → 0.1.5
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/crud.service.js +3 -3
- package/dist/cjs/services/crud.service.js.map +1 -1
- package/dist/cjs/services/crudFactory.service.js +2 -2
- package/dist/cjs/services/crudFactory.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js +19 -11
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/connection.service.js +13 -23
- package/dist/cjs/services/cruds/postgresql/connection.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js +8 -12
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/query.service.js +8 -11
- package/dist/cjs/services/cruds/postgresql/query.service.js.map +1 -1
- package/dist/cjs/types/dbPoolClient.type.js +3 -0
- package/dist/cjs/types/dbPoolClient.type.js.map +1 -0
- package/dist/cjs/types/index.js +1 -0
- package/dist/cjs/types/index.js.map +1 -1
- package/dist/types/index.d.ts +4 -1
- package/package.json +1 -1
|
@@ -11,15 +11,15 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
15
14
|
const crudHelpers_1 = require("../helpers/crudHelpers");
|
|
16
15
|
const crudFactory_service_1 = require("./crudFactory.service");
|
|
17
16
|
class CrudService {
|
|
18
|
-
constructor(crudSchema) {
|
|
17
|
+
constructor(crudSchema, poolClient) {
|
|
18
|
+
this.poolClient = poolClient;
|
|
19
19
|
this.crudSchema = crudSchema;
|
|
20
20
|
}
|
|
21
21
|
async getCrudServiceInstance() {
|
|
22
|
-
const crudService = await crudFactory_service_1.CrudFactory.databaseClientService(this.crudSchema);
|
|
22
|
+
const crudService = await crudFactory_service_1.CrudFactory.databaseClientService(this.crudSchema, this.poolClient);
|
|
23
23
|
return crudService;
|
|
24
24
|
}
|
|
25
25
|
getDefaultValue(columnName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../src/services/crud.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../src/services/crud.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAEA,wDAIgC;AAWhC,+DAAoD;AAEpD,MAAM,WAAW;IAGb,YACI,UAA6B,EACrB,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;QAE/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAChC,MAAM,WAAW,GAAG,MAAM,iCAAW,CAAC,qBAAqB,CACvD,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,CAClB,CAAC;QACF,OAAO,WAAW,CAAC;IACvB,CAAC;IAEO,eAAe,CAAC,UAAkB;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,CAAC;IAEO,gBAAgB,CAAC,IAAS;QAC9B,MAAM,aAAa,GAA2B,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAExC,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE;YAC9B,MAAM,kBAAkB,GAAG,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;YACjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAC5D,IAAI,kBAAkB,IAAI,kBAAkB,EAAE;gBAC1C,aAAa,CAAC,UAAU,CAAC,GAAG,kBAAkB,CAAC;aAClD;SACJ;QAED,uCAAY,aAAa,GAAK,IAAI,EAAG;IACzC,CAAC;IAED,MAAM,CAAC,IAAa;QAChB,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAElC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CACpC,CAAC;IACN,CAAC;IAED,IAAI,CAAC,OAAqB;QACtB,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAC5B,CAAC;IACN,CAAC;IAED,QAAQ,CAAC,OAAqB;QAC1B,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAChC,CAAC;IACN,CAAC;IAED,MAAM,CACF,OAAqC,EACrC,IAAgB;QAEhB,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CACxC,CAAC;IACN,CAAC;IAED,MAAM,CACF,OAAmD,EACnD,UAA0B,EAAE;QAE5B,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CACvC,CAAC;IACN,CAAC;IAED,OAAO,CAAC,OAAqB;QACzB,6EAA6E;QAC7E,MAAM,EAAE,UAAU,KAAwB,OAAO,EAA1B,cAAc,UAAK,OAAO,EAA3C,cAAiC,CAAU,CAAC;QAClD,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CACtC,CAAC;IACN,CAAC;IAED,SAAS,CAAC,gBAA8B;QACpC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAC1C,CAAC;IACN,CAAC;IAED,WAAW,CAAC,SAAiB,EAAE,KAAU,EAAE,QAAQ,GAAG,OAAO;QACzD,OAAO,IAAA,yBAAW,EAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,OAAiB;QAChD,OAAO,IAAA,6BAAe,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,SAAiB;QACvC,OAAO,IAAA,uBAAS,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB,CACZ,OAAqC,EACrC,OAA2B,EAC3B,OAAmC;QAEnC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CACtD,WAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAC3D,CAAC;IACN,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.CrudFactory = void 0;
|
|
27
27
|
class CrudFactory {
|
|
28
|
-
static async databaseClientService(crudSchema) {
|
|
28
|
+
static async databaseClientService(crudSchema, poolClient) {
|
|
29
29
|
var _a;
|
|
30
30
|
const isMultiPlatformMode = ((_a = process.env.PLATFORM_TYPE) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'container';
|
|
31
31
|
let DatabaseCrudService;
|
|
@@ -37,7 +37,7 @@ class CrudFactory {
|
|
|
37
37
|
const module = await Promise.resolve().then(() => __importStar(require('./cruds/dynamodb/dynamoDbCrud.service')));
|
|
38
38
|
DatabaseCrudService = module.DynamoDbCrudService;
|
|
39
39
|
}
|
|
40
|
-
return new DatabaseCrudService(crudSchema);
|
|
40
|
+
return new DatabaseCrudService(crudSchema, poolClient);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
exports.CrudFactory = CrudFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crudFactory.service.js","sourceRoot":"","sources":["../../../src/services/crudFactory.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"crudFactory.service.js","sourceRoot":"","sources":["../../../src/services/crudFactory.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,MAAa,WAAW;IACpB,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAC9B,UAA6B,EAC7B,UAAuB;;QAEvB,MAAM,mBAAmB,GACrB,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,0CAAE,WAAW,EAAE,MAAK,WAAW,CAAC;QAE7D,IAAI,mBAGgB,CAAC;QAErB,IAAI,mBAAmB,EAAE;YACrB,MAAM,MAAM,GAAG,wDACX,2CAA2C,GAC9C,CAAC;YACF,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC;SACtD;aAAM;YACH,MAAM,MAAM,GAAG,wDACX,uCAAuC,GAC1C,CAAC;YACF,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;SACpD;QAED,OAAO,IAAI,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;CACJ;AA3BD,kCA2BC"}
|
|
@@ -282,15 +282,20 @@ class DynamoDbCrudService {
|
|
|
282
282
|
const primaryKeys = this.defaultPrimaryKeys;
|
|
283
283
|
const keyObject = __classPrivateFieldGet(this, _DynamoDbCrudService_instances, "m", _DynamoDbCrudService_getKeyObjectForUpdateExpression).call(this, queryObject, primaryKeys);
|
|
284
284
|
const updateExpressions = [];
|
|
285
|
-
let attributeValues = {};
|
|
286
285
|
Object.keys(actions).forEach((action) => {
|
|
287
|
-
const
|
|
286
|
+
const actionUpdateExpression = __classPrivateFieldGet(this, _DynamoDbCrudService_instances, "m", _DynamoDbCrudService_extractUpdateExpressionAttributesAndNames).call(this, actions, action);
|
|
288
287
|
updateExpressions.push(actionUpdateExpression);
|
|
289
|
-
attributeValues = Object.assign(Object.assign({}, attributeValues), ueAttributeValues);
|
|
290
288
|
});
|
|
291
|
-
const {
|
|
292
|
-
|
|
293
|
-
|
|
289
|
+
const dbParams = Object.assign({ UpdateExpression: updateExpressions.join(' ') }, __classPrivateFieldGet(this, _DynamoDbCrudService_instances, "m", _DynamoDbCrudService_getUpdateExpressionOptions).call(this, options));
|
|
290
|
+
const { ExpressionAttributeValues, ExpressionAttributeNames } = queryObject;
|
|
291
|
+
if (Object.keys(ExpressionAttributeValues).length > 0) {
|
|
292
|
+
dbParams['ExpressionAttributeValues'] = Object.assign(Object.assign({}, ExpressionAttributeValues), dbParams.ExpressionAttributeValues);
|
|
293
|
+
}
|
|
294
|
+
if (Object.keys(ExpressionAttributeNames).length > 0) {
|
|
295
|
+
dbParams['ExpressionAttributeNames'] = Object.assign(Object.assign({}, ExpressionAttributeNames), dbParams.ExpressionAttributeNames);
|
|
296
|
+
}
|
|
297
|
+
if (queryObject.FilterExpression)
|
|
298
|
+
dbParams['ConditionExpression'] = queryObject.FilterExpression;
|
|
294
299
|
return this.dynamoDbClientService.updateExpressions(keyObject, dbParams);
|
|
295
300
|
}
|
|
296
301
|
}
|
|
@@ -321,10 +326,15 @@ _DynamoDbCrudService_instances = new WeakSet(), _DynamoDbCrudService_buildUpdate
|
|
|
321
326
|
const updateExprOptions = {
|
|
322
327
|
ReturnValues: options.returnValues,
|
|
323
328
|
};
|
|
329
|
+
if (options.expressionAttributeNames)
|
|
330
|
+
updateExprOptions.ExpressionAttributeNames =
|
|
331
|
+
options.expressionAttributeNames;
|
|
332
|
+
if (options.expressionAttributeValues)
|
|
333
|
+
updateExprOptions.ExpressionAttributeValues =
|
|
334
|
+
options.expressionAttributeValues;
|
|
324
335
|
return updateExprOptions;
|
|
325
336
|
}, _DynamoDbCrudService_extractUpdateExpressionAttributesAndNames = function _DynamoDbCrudService_extractUpdateExpressionAttributesAndNames(actions, actionType) {
|
|
326
337
|
const actionUpdateExpressions = [];
|
|
327
|
-
const ueAttributeValues = {};
|
|
328
338
|
actions[actionType].forEach((action) => {
|
|
329
339
|
switch (actionType) {
|
|
330
340
|
case constants_1.DYNAMO_DB_UPDATE_ACTIONS.DELETE:
|
|
@@ -334,17 +344,15 @@ _DynamoDbCrudService_instances = new WeakSet(), _DynamoDbCrudService_buildUpdate
|
|
|
334
344
|
case constants_1.DYNAMO_DB_UPDATE_ACTIONS.ADD:
|
|
335
345
|
case constants_1.DYNAMO_DB_UPDATE_ACTIONS.SET:
|
|
336
346
|
{
|
|
337
|
-
const actionName = `:${action.path}`;
|
|
338
|
-
ueAttributeValues[actionName] = action.value;
|
|
339
347
|
let operator = '';
|
|
340
348
|
if (actionType == constants_1.DYNAMO_DB_UPDATE_ACTIONS.SET)
|
|
341
349
|
operator = '=';
|
|
342
|
-
actionUpdateExpressions.push(`${action.path} ${operator}${
|
|
350
|
+
actionUpdateExpressions.push(`${action.path} ${operator}${action.value}`);
|
|
343
351
|
}
|
|
344
352
|
break;
|
|
345
353
|
}
|
|
346
354
|
});
|
|
347
355
|
const actionUpdateExpression = `${actionType} ${actionUpdateExpressions.join(', ')}`;
|
|
348
|
-
return
|
|
356
|
+
return actionUpdateExpression;
|
|
349
357
|
};
|
|
350
358
|
//# sourceMappingURL=dynamoDbCrud.service.js.map
|
|
@@ -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":";;;;;;;;;;;;AAAA,uDAAuD;AACvD,sFAA6D;AAC7D,kFAAyD;AAEzD,wDAKkC;AAalC,8DAIsC;AAOtC,MAAa,mBAAmB;IAG5B,YAAoB,WAA8B;;QAA9B,gBAAW,GAAX,WAAW,CAAmB;QAC9C,IAAI,CAAC,qBAAqB,GAAG,IAAI,gCAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,IAAY,SAAS;QACjB,OAAO,IAAA,0BAAY,EAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAY,YAAY;QACpB,OAAO,IAAA,8BAAgB,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,IAAY,kBAAkB;QAC1B,OAAO,IAAA,kCAAoB,EAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa;;QACtB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,MAAM,QAAQ,GACV,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC3D,OAAO;gBACH,gBAAgB,EAAE,MAAA,QAAQ,CAAC,gBAAgB,mCAAI,EAAE;aACpD,CAAC;SACL;aAAM;YACH,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAA2B,CAAC,CAAC;YAClE,OAAO,IAAS,CAAC;SACpB;IACL,CAAC;IAED,6EAA6E;IAC7E,QAAQ,CAAC,YAAiB;QACtB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,UAAwB,EAAE;;QAC3B,MAAM,KAAK,GAAG,IAAI,8BAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvD,IAAI,MAAA,OAAO,CAAC,KAAK,0CAAE,SAAS;YACxB,KAAK,CAAC,UAAU,CAAC,MAAA,OAAO,CAAC,KAAK,0CAAE,SAAS,CAAC,CAAC;QAE/C,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,MAAA,OAAO,CAAC,KAAK,0CAAE,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,OAAO,CAAC,cAAc;YACtB,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEjD,IAAI,OAAO,CAAC,MAAM;YAAE,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAErD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAElC,IAAI,OAAO,CAAC,iBAAiB,KAAK,+BAAmB,CAAC,KAAK;YACvD,KAAK,CAAC,KAAK,EAAE,CAAC;QAElB,OAAO,IAAI,CAAC,YAAY,CACpB,KAAK,CAAC,GAAG,EAAE,EACX,MAAA,OAAO,CAAC,UAAU,0CAAE,KAAK,EACzB,OAAO,CAAC,OAAO,CAClB,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;;YAChB,MAAM,UAAU,GAAoB,EAAE,CAAC;YACvC,IAAI,GAAG,CAAC,gBAAgB;gBAAE,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC,gBAAgB,CAAC;YACjE,IAAI,MAAA,OAAO,CAAC,UAAU,0CAAE,KAAK;gBACzB,UAAU,CAAC,KAAK,GAAG,MAAA,OAAO,CAAC,UAAU,0CAAE,KAAK,CAAC;YACjD,OAAO;gBACH,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,UAAU;gBACV,KAAK,EAAE,GAAG,CAAC,KAAK;aACnB,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,YAAY,CACd,OAA6C,EAC7C,QAAgB,GAAG,EACnB,UAAmB,KAAK;;QAExB,IAAI,OAAO,GAAc,EAAE,CAAC;QAC5B,IAAI,gBAAgB,GAA4B,EAAE,CAAC;QACnD,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,GAAG;YACC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAChC,OAAO,EACP,OAAO,EACP,gBAAgB,CACnB,CAAC;YACF,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,KAAK,mCAAI,EAAE,CAAC;YAChC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,gBAAgB,GAAG,MAAA,MAAM,CAAC,gBAAgB,mCAAI,EAAE,CAAC;YACjD,SAAS,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;SAC5C,QAAQ,SAAS,GAAG,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,EAAE;QAEvE,MAAM,yBAAyB,GAAG,IAAI,CAAC,gBAAgB,CACnD,gBAAgB,CACnB;YACG,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC;QACX,OAAO;YACH,KAAK,EAAE,OAAO;YACd,gBAAgB,EAAE,yBAAyB;YAC3C,KAAK,EAAE,SAAS;SACnB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,OAA6C,EAC7C,OAAgB,EAChB,gBAAyC;;QAEzC,IAAI,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC;YACvC,OAAO,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO;YACzB,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC;YAC1C,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAEjD,IAAI,OAAO,CAAC,MAAM,KAAK,+BAAmB,CAAC,KAAK,EAAE;YAC9C,OAAO,CAAC,KAAK,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM,mCAAI,CAAC,CAAC,CAAC;SACtE;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,eAAe,CACX,KAA0B,EAC1B,UAAuC;QAEvC,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK;YAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI;YAChB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,OAAO,CACT,UAAwB,EAAE,EAC1B,aAAoB,EAAE,EACtB,YAAoB,CAAC;QAErB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9D,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC1B,SAAS,IAAI,KAAK,CAAC;QAEnB,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI;YAChB,MAAM,IAAI,CAAC,OAAO,iCAAM,OAAO,KAAE,UAAU,KAAI,UAAU,CAAC,CAAC;QAE/D,OAAO;YACH,KAAK,EAAE,UAAU;YACjB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,SAAS;SACnB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,UAAwB,EAAE;;QACtC,MAAM,WAAW,mCACV,OAAO,KACV,iBAAiB,EAAE,+BAAmB,CAAC,KAAK,GAC/C,CAAC;QACF,IAAI,MAAA,OAAO,CAAC,UAAU,0CAAE,IAAI,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC1D;aAAM;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC7D;IACL,CAAC;IAED,kBAAkB,CAAC,OAAqB;;QACpC,MAAM,KAAK,GAAG,IAAI,8BAAmB,EAAE,CAAC;QAExC,IAAI,MAAA,OAAO,CAAC,KAAK,0CAAE,SAAS;YAAE,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEf,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,QAAQ,CAAC,OAAqB;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;;YACjE,IAAI,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM;gBAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAM,CAAC;YACtD,IAAI,OAAO,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB,CAAC,KAA0B,EAAE,MAAe;;QACxD,MAAM,QAAQ,GACV,+BAAmB,CACf,MAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,EAAE,mCAAI,8BAAkB,CAAC,KAAK,CAC7D,CAAC;QACL,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,iBAAiB,CACb,KAA0B,EAC1B,MAAe,EACf,gBAAwB,KAAK,EAC7B,MAAY;;QAEZ,MAAM,QAAQ,GACV,+BAAmB,CACf,MAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,EAAE,mCAAI,8BAAkB,CAAC,KAAK,CAC7D,CAAC;QACL,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,EAAE,MAAM,CAAS,CAC1D,QAAQ,CACX,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,YAAY,CAAC,KAA0B,EAAE,OAAqB;QAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAChC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC3C;aAAM;YACH,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SAC7C;IACL,CAAC;IAED,kBAAkB,CAAC,KAA0B,EAAE,OAAqB;;QAChE,MAAM,iBAAiB,GAAG,MAAA,MAAA,OAAO,CAAC,KAAK,0CAAE,OAAO,mCAAI,EAAE,CAAC;QACvD,MAAM,sBAAsB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAEvD,MAAM,eAAe,GAAa,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM;YACvD,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,sBAAsB,CAAC;QAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAoB,CAAC;QAC7C,OAAO,CAAC,OAAO,CAAC,CAAC,MAAe,EAAE,EAAE;YAChC,MAAM,eAAe,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACnE,eAAe,IAAI,CAAC,OAAO,CAAC,OAAO;gBAC/B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC;gBACtC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAAC,KAA0B,EAAE,OAAqB;QAClE,IAAI,CAAC,OAAO,CAAC,OAAO;YAAE,OAAO;QAC7B,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,qBAAqB,CACjB,KAA0B,EAC1B,OAAqB,EACrB,SAAkB;;QAElB,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAA2B,CAAC;QAC7D,MAAM,iBAAiB,GAAG,CAAA,MAAA,OAAO,CAAC,KAAK,0CAAE,OAAO,KAAI,EAAE,CAAC;QACvD,MAAM,sBAAsB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAEvD,MAAM,eAAe,GAAG,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM;YAC7C,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,sBAAsB,CAAC;QAE7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACzD,KAAK,CAAC,OAAO,CACT,CAAC,MAAkC,EAAE,KAAa,EAAE,EAAE;gBAClD,MAAM,iBAAiB,GAAG,IAAI,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,CAAC;gBAC5D,IAAI,iBAAiB,EAAE;oBACnB,MAAM,UAAU,mCACT,OAAO,KACV,OAAO,EAAE,MAAM,GAClB,CAAC;oBACF,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;iBACtD;qBAAM;oBACH,MAAM,YAAY,GAAG,MAAiB,CAAC;oBACvC,MAAM,eAAe,GAAG,eAAe,CAAC,QAAQ,CAC5C,YAAY,CAAC,SAAS,CACzB,CAAC;oBACF,IAAI,MAAM,CAAC;oBACX,IAAI,SAAS,EAAE;wBACX,MAAM,GAAG;4BACL,SAAS;4BACT,cAAc,EAAE,KAAK,KAAK,CAAC;4BAC3B,eAAe,EAAE,KAAK,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC;yBAC9C,CAAC;qBACL;oBAED,eAAe,IAAI,CAAC,OAAO,CAAC,OAAO;wBAC/B,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC;wBAC5C,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAClB,KAAK,EACL,YAAY,EACZ,GAAG,EACH,MAAM,CACT,CAAC;iBACX;YACL,CAAC,CACJ,CAAC;SACL;IACL,CAAC;IAED,YAAY,CAAC,KAA0B,EAAE,OAAY,EAAE,SAAkB;QACrE,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;YACjB,IAAI,SAAS;gBAAE,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,MAAM,EAAE;gBACjC,KAAK,CAAC,UAAU,EAAE,CAAC;aACtB;iBAAM;gBACH,KAAK,CAAC,SAAS,EAAE,CAAC;aACrB;SACJ;IACL,CAAC;IAED,gBAAgB,CAAC,GAAY;QACzB,OAAO,CACH,GAAG,KAAK,IAAI;YACZ,OAAO,GAAG,KAAK,QAAQ;YACvB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAC9B,CAAC;IACN,CAAC;IAED,oBAAoB,CAAC,GAAwB;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAED,oBAAoB,CAAC,UAAkB;QACnC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,MAAM,CACR,OAAqC,EACrC,IAAgB,EAChB,EAAE,OAAO,GAAG,KAAK,EAAE;QAEnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YACpC,OAAO,EAAE,OAAoB;SAChC,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE;YACT,mGAAmG;SACtG;QAED,MAAM,OAAO,mCACN,WAAW,GACX,IAAI,CACV,CAAC;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CACR,OAAmD,EACnD,OAAuB;QAEvB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,EAAE;YACvB,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CACxC,OAAsB,CACzB,CAAC;SACL;aAAM;YACH,MAAM,GAAG,GAAI,OAAqB,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;gBAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChC,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC3B,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC;YACP,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAChD;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CACnB,OAAqC,EACrC,OAA2B,EAC3B,OAAkC;QAElC,MAAM,WAAW,GAAG,uBAAA,IAAI,uFAA4B,MAAhC,IAAI,EAA6B,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QACxE,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAE5C,MAAM,SAAS,GAAQ,uBAAA,IAAI,4FAAiC,MAArC,IAAI,EACvB,WAAW,EACX,WAAW,CACd,CAAC;QAEF,MAAM,iBAAiB,GAAQ,EAAE,CAAC;QAElC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;YAC5C,MAAM,sBAAsB,GACxB,uBAAA,IAAI,sGAA2C,MAA/C,IAAI,EACA,OAAO,EACP,MAAM,CACT,CAAC;YACN,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,mBACV,gBAAgB,EAAE,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,IAC1C,uBAAA,IAAI,uFAA4B,MAAhC,IAAI,EAA6B,OAAO,CAAC,CAC/C,CAAC;QAEF,MAAM,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,GACzD,WAAW,CAAC;QAChB,IAAI,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACnD,QAAQ,CAAC,2BAA2B,CAAC,mCAC9B,yBAAyB,GACzB,QAAQ,CAAC,yBAAyB,CACxC,CAAC;SACL;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,QAAQ,CAAC,0BAA0B,CAAC,mCAC7B,wBAAwB,GACxB,QAAQ,CAAC,wBAAwB,CACvC,CAAC;SACL;QACD,IAAI,WAAW,CAAC,gBAAgB;YAC5B,QAAQ,CAAC,qBAAqB,CAAC,GAAG,WAAW,CAAC,gBAAgB,CAAC;QAEnE,OAAO,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAC/C,SAAS,EACT,QAAQ,CACX,CAAC;IACN,CAAC;CAgFJ;AAzeD,kDAyeC;2JA9E+B,OAAqB;;IAC7C,MAAM,KAAK,GAAG,IAAI,8BAAmB,EAAE,CAAC;IAExC,IAAI,MAAA,OAAO,CAAC,KAAK,0CAAE,SAAS;QAAE,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACxE,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAElC,OAAO,KAAK,CAAC;AACjB,CAAC,uHAEgC,WAAgB,EAAE,WAAgB;IAC/D,MAAM,SAAS,GAAQ,EAAE,CAAC;IAE1B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC,OAAO,CACrD,CAAC,SAAS,EAAE,EAAE;QACV,MAAM,kBAAkB,GAAG,SAAS;aAC/B,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;aAChB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACtB,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;YAC1C,MAAM,SAAS,GAAG,IAAI,kBAAkB,GAAG,CAAC;YAC5C,SAAS,CAAC,kBAAkB,CAAC;gBACzB,WAAW,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;YACrD,OAAO,WAAW,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;YACxD,OAAO,WAAW,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;SAC1D;IACL,CAAC,CACJ,CAAC;IAEF,OAAO,SAAS,CAAC;AACrB,CAAC,6GAE2B,OAAkC;IAC1D,MAAM,iBAAiB,GAAQ;QAC3B,YAAY,EAAE,OAAO,CAAC,YAAY;KACrC,CAAC;IAEF,IAAI,OAAO,CAAC,wBAAwB;QAChC,iBAAiB,CAAC,wBAAwB;YACtC,OAAO,CAAC,wBAAwB,CAAC;IACzC,IAAI,OAAO,CAAC,yBAAyB;QACjC,iBAAiB,CAAC,yBAAyB;YACvC,OAAO,CAAC,yBAAyB,CAAC;IAE1C,OAAO,iBAAiB,CAAC;AAC7B,CAAC,2IAGG,OAAY,EACZ,UAAkB;IAElB,MAAM,uBAAuB,GAAQ,EAAE,CAAC;IAExC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,MAAW,EAAE,EAAE;QACxC,QAAQ,UAAU,EAAE;YAChB,KAAK,oCAAwB,CAAC,MAAM,CAAC;YACrC,KAAK,oCAAwB,CAAC,MAAM;gBAChC,uBAAuB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC/C,MAAM;YAEV,KAAK,oCAAwB,CAAC,GAAG,CAAC;YAClC,KAAK,oCAAwB,CAAC,GAAG;gBAC7B;oBACI,IAAI,QAAQ,GAAG,EAAE,CAAC;oBAClB,IAAI,UAAU,IAAI,oCAAwB,CAAC,GAAG;wBAC1C,QAAQ,GAAG,GAAG,CAAC;oBACnB,uBAAuB,CAAC,IAAI,CACxB,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,CAC9C,CAAC;iBACL;gBACD,MAAM;SACb;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,sBAAsB,GAAG,GAAG,UAAU,IAAI,uBAAuB,CAAC,IAAI,CACxE,IAAI,CACP,EAAE,CAAC;IAEJ,OAAO,sBAAsB,CAAC;AAClC,CAAC"}
|
|
@@ -2,37 +2,27 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const pg_1 = require("pg");
|
|
4
4
|
class ConnectionService {
|
|
5
|
-
constructor(usePool) {
|
|
6
|
-
this.pool = null;
|
|
7
|
-
if (usePool)
|
|
8
|
-
this.pool = new pg_1.Pool({ connectionString: this.connectionString });
|
|
9
|
-
}
|
|
10
5
|
get connectionString() {
|
|
11
|
-
|
|
6
|
+
const connectionString = process.env.MULTIPLATFORM_PG_CONNECTION_STRING || '';
|
|
7
|
+
if (!connectionString) {
|
|
8
|
+
throw new Error('MULTIPLATFORM_PG_CONNECTION_STRING environment variable must be configured');
|
|
9
|
+
}
|
|
10
|
+
return connectionString;
|
|
12
11
|
}
|
|
13
12
|
async getClient() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
connectionString: this.connectionString,
|
|
20
|
-
});
|
|
21
|
-
await client.connect();
|
|
22
|
-
return client;
|
|
23
|
-
}
|
|
13
|
+
const client = new pg_1.Client({
|
|
14
|
+
connectionString: this.connectionString,
|
|
15
|
+
});
|
|
16
|
+
await client.connect();
|
|
17
|
+
return client;
|
|
24
18
|
}
|
|
25
19
|
releaseClient(client) {
|
|
26
20
|
try {
|
|
27
|
-
|
|
28
|
-
client.release();
|
|
29
|
-
}
|
|
30
|
-
else if ('end' in client) {
|
|
31
|
-
client.end();
|
|
32
|
-
}
|
|
21
|
+
client.end();
|
|
33
22
|
}
|
|
34
23
|
catch (_a) {
|
|
35
|
-
//
|
|
24
|
+
// eslint-disable-next-line no-console
|
|
25
|
+
console.log('Error releasing client');
|
|
36
26
|
}
|
|
37
27
|
}
|
|
38
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/connection.service.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/connection.service.ts"],"names":[],"mappings":";;AAAA,2BAA4B;AAE5B,MAAqB,iBAAiB;IAClC,IAAI,gBAAgB;QAChB,MAAM,gBAAgB,GAClB,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,EAAE,CAAC;QACzD,IAAI,CAAC,gBAAgB,EAAE;YACnB,MAAM,IAAI,KAAK,CACX,4EAA4E,CAC/E,CAAC;SACL;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,MAAM,GAAW,IAAI,WAAM,CAAC;YAC9B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SAC1C,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,aAAa,CAAC,MAAc;QACxB,IAAI;YACA,MAAM,CAAC,GAAG,EAAE,CAAC;SAChB;QAAC,WAAM;YACJ,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;SACzC;IACL,CAAC;CACJ;AA5BD,oCA4BC"}
|
|
@@ -11,9 +11,8 @@ const constants_1 = require("../../../utils/constants");
|
|
|
11
11
|
const tableHelper_1 = require("../../../helpers/tableHelper");
|
|
12
12
|
const queryHelpers_1 = require("../../../helpers/queryHelpers");
|
|
13
13
|
class PostgresqlClientService extends query_service_1.default {
|
|
14
|
-
constructor(tableSchema) {
|
|
15
|
-
|
|
16
|
-
super(useConnectionPool);
|
|
14
|
+
constructor(tableSchema, poolClient) {
|
|
15
|
+
super(poolClient);
|
|
17
16
|
this.isCompositeFilter = function (value) {
|
|
18
17
|
return 'OR' in value || 'AND' in value;
|
|
19
18
|
};
|
|
@@ -128,7 +127,7 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
128
127
|
const keys = Object.keys(data[0]); // Assuming all objects have the same keys
|
|
129
128
|
const values = data.map((item) => Object.values(item));
|
|
130
129
|
const query = (0, pg_format_1.default)(`INSERT INTO ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)} (%I) VALUES %L RETURNING *;`, keys, values);
|
|
131
|
-
return this.
|
|
130
|
+
return this.runQuery(query);
|
|
132
131
|
}
|
|
133
132
|
addFiltersToQuery(query, filters) {
|
|
134
133
|
if (filters)
|
|
@@ -176,7 +175,7 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
176
175
|
query = this.addOrderByToQuery(query, options.sorting);
|
|
177
176
|
query = this.addPaginationToQuery(query, options.pagination);
|
|
178
177
|
}
|
|
179
|
-
return (await this.
|
|
178
|
+
return (await this.runQuery(query)).rows;
|
|
180
179
|
}
|
|
181
180
|
sanitizeValue(value) {
|
|
182
181
|
if (Array.isArray(value)) {
|
|
@@ -208,7 +207,7 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
208
207
|
query += ` ${updateClauses.join(', ')}`;
|
|
209
208
|
query += ' WHERE ';
|
|
210
209
|
query += this.buildFilterClause(filters);
|
|
211
|
-
return this.
|
|
210
|
+
return this.runQuery(query);
|
|
212
211
|
}
|
|
213
212
|
buildFilterClauseForFilterGroups(filterGroups) {
|
|
214
213
|
const filterClauses = filterGroups.map((filterGroup) => {
|
|
@@ -227,20 +226,17 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
227
226
|
query += this.buildFilterClause(filters);
|
|
228
227
|
}
|
|
229
228
|
}
|
|
230
|
-
return this.
|
|
229
|
+
return this.runQuery(query);
|
|
231
230
|
}
|
|
232
231
|
query(queryText, values) {
|
|
233
|
-
return this.
|
|
232
|
+
return this.runQuery(queryText, values);
|
|
234
233
|
}
|
|
235
234
|
async updateExpressions(
|
|
236
235
|
// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
|
|
237
236
|
filters,
|
|
238
237
|
// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
|
|
239
238
|
actions) {
|
|
240
|
-
return this.
|
|
241
|
-
}
|
|
242
|
-
executeQuery(queryText, values) {
|
|
243
|
-
return this.runQuery(queryText, values, this.crudSchema.poolClient);
|
|
239
|
+
return this.runQuery('');
|
|
244
240
|
}
|
|
245
241
|
}
|
|
246
242
|
exports.default = PostgresqlClientService;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const connection_service_1 = __importDefault(require("./connection.service"));
|
|
7
7
|
class QueryService {
|
|
8
|
-
constructor(
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
throw new Error('MULTIPLATFORM_PG_CONNECTION_STRING environment variable must be configured');
|
|
12
|
-
}
|
|
13
|
-
this.connectionService = new connection_service_1.default(usePool);
|
|
8
|
+
constructor(poolClient) {
|
|
9
|
+
this.poolClient = poolClient;
|
|
10
|
+
this.connectionService = new connection_service_1.default();
|
|
14
11
|
}
|
|
15
|
-
async runQuery(queryText, values
|
|
16
|
-
const client = poolClient
|
|
17
|
-
? poolClient
|
|
18
|
-
:
|
|
12
|
+
async runQuery(queryText, values) {
|
|
13
|
+
const client = await (this.poolClient
|
|
14
|
+
? this.poolClient
|
|
15
|
+
: this.connectionService.getClient());
|
|
19
16
|
try {
|
|
20
17
|
const result = await client.query(queryText, values);
|
|
21
18
|
return result;
|
|
@@ -25,7 +22,7 @@ class QueryService {
|
|
|
25
22
|
throw error;
|
|
26
23
|
}
|
|
27
24
|
finally {
|
|
28
|
-
if (!poolClient)
|
|
25
|
+
if (!this.poolClient)
|
|
29
26
|
this.connectionService.releaseClient(client);
|
|
30
27
|
}
|
|
31
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/query.service.ts"],"names":[],"mappings":";;;;;AAGA,8EAAqD;
|
|
1
|
+
{"version":3,"file":"query.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/query.service.ts"],"names":[],"mappings":";;;;;AAGA,8EAAqD;AAGrD,MAAqB,YAAY;IAG7B,YAAoB,UAAyB;QAAzB,eAAU,GAAV,UAAU,CAAe;QACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,4BAAiB,EAAE,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,SAAiB,EACjB,MAAc;QAEd,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU;YACjC,CAAC,CAAC,IAAI,CAAC,UAAU;YACjB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,CAAC;QAE1C,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACrD,OAAO,MAAM,CAAC;SACjB;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,KAAK,CAAC;SACf;gBAAS;YACN,IAAI,CAAC,IAAI,CAAC,UAAU;gBAChB,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAgB,CAAC,CAAC;SAC9D;IACL,CAAC;CACJ;AA1BD,+BA0BC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dbPoolClient.type.js","sourceRoot":"","sources":["../../../src/types/dbPoolClient.type.ts"],"names":[],"mappings":""}
|
package/dist/cjs/types/index.js
CHANGED
|
@@ -19,4 +19,5 @@ __exportStar(require("./sortDirection.type"), exports);
|
|
|
19
19
|
__exportStar(require("./filterLogicOperator.type"), exports);
|
|
20
20
|
__exportStar(require("./connectionClosingMode.type"), exports);
|
|
21
21
|
__exportStar(require("./aggregateFunction.type"), exports);
|
|
22
|
+
__exportStar(require("./dbPoolClient.type"), exports);
|
|
22
23
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,uDAAqC;AACrC,6DAA2C;AAC3C,+DAA6C;AAC7C,2DAAyC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,uDAAqC;AACrC,6DAA2C;AAC3C,+DAA6C;AAC7C,2DAAyC;AACzC,sDAAoC"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -87,6 +87,8 @@ interface IUpdateExpressions {
|
|
|
87
87
|
interface IUpdateExpressionsOptions {
|
|
88
88
|
returnValues?: string;
|
|
89
89
|
conditionExpression?: string;
|
|
90
|
+
expressionAttributeNames?: unknown;
|
|
91
|
+
expressionAttributeValues?: unknown;
|
|
90
92
|
}
|
|
91
93
|
|
|
92
94
|
interface ICrudService<T> {
|
|
@@ -124,8 +126,9 @@ declare class CrudSchema {
|
|
|
124
126
|
}
|
|
125
127
|
|
|
126
128
|
declare class CrudService<T> {
|
|
129
|
+
private poolClient?;
|
|
127
130
|
private crudSchema;
|
|
128
|
-
constructor(crudSchema: typeof CrudSchema);
|
|
131
|
+
constructor(crudSchema: typeof CrudSchema, poolClient?: PoolClient | undefined);
|
|
129
132
|
private getCrudServiceInstance;
|
|
130
133
|
private getDefaultValue;
|
|
131
134
|
private setDefaultValues;
|