@golemio/core 1.1.7-dev.402797043 → 1.1.8-dev.414684133
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/CHANGELOG.md
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
All notable changes to this project will be documented in this file.
|
|
4
|
+
|
|
5
|
+
## [Unreleased]
|
|
6
|
+
|
|
7
|
+
## [1.1.7] - 2021-11-23
|
|
8
|
+
|
|
9
|
+
### Added
|
|
10
|
+
|
|
11
|
+
- Add sync to pg model
|
|
12
|
+
|
|
13
|
+
### Changed
|
|
14
|
+
|
|
15
|
+
- Custom postgres model schema ([pid#53](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/issues/53))
|
|
16
|
+
- Upgrade apicache
|
|
17
|
+
- Use custom schema in saveBySqlFunction ([pid#53](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/issues/53))
|
|
18
|
+
|
|
19
|
+
### Security
|
|
20
|
+
|
|
21
|
+
- Security update - mocha
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { JSONSchemaValidator, Validator } from "@golemio/validator";
|
|
2
|
-
import { ModelCtor, Transaction, Sequelize } from "sequelize";
|
|
2
|
+
import { ModelCtor, Transaction, Sequelize, Model } from "sequelize";
|
|
3
3
|
import { IModel, ISequelizeSettings } from "./";
|
|
4
|
+
import { SyncOptions } from "sequelize/types/lib/sequelize";
|
|
4
5
|
export declare class PostgresModel implements IModel {
|
|
5
6
|
/** Model name */
|
|
6
7
|
name: string;
|
|
@@ -14,6 +15,8 @@ export declare class PostgresModel implements IModel {
|
|
|
14
15
|
protected savingType: "insertOnly" | "insertOrUpdate";
|
|
15
16
|
/** Table name */
|
|
16
17
|
protected tableName: string;
|
|
18
|
+
/** Postgres schema */
|
|
19
|
+
protected schema: string;
|
|
17
20
|
constructor(name: string, settings: ISequelizeSettings, validator: Validator | JSONSchemaValidator);
|
|
18
21
|
save: (data: any, useTmpTable?: boolean) => Promise<any>;
|
|
19
22
|
query: (query: string) => Promise<[unknown[], unknown]>;
|
|
@@ -23,6 +26,7 @@ export declare class PostgresModel implements IModel {
|
|
|
23
26
|
findOne: (opts: object, useTmpTable?: boolean) => Promise<any>;
|
|
24
27
|
findAndCountAll: (opts: object, useTmpTable?: boolean) => Promise<any>;
|
|
25
28
|
update: (data: any, opts: any, useTmpTable?: boolean) => Promise<any>;
|
|
29
|
+
sync: <M extends Model<any, any>>(options?: SyncOptions | undefined) => Promise<M>;
|
|
26
30
|
private insertOnly;
|
|
27
31
|
private insertOrUpdate;
|
|
28
32
|
private getSequelizeModelSafely;
|
|
@@ -60,7 +60,7 @@ class PostgresModel {
|
|
|
60
60
|
stringifiedData +
|
|
61
61
|
"'::json, " + // p_data json
|
|
62
62
|
"'" +
|
|
63
|
-
(useTmpTable ? "tmp" :
|
|
63
|
+
(useTmpTable ? "tmp" : this.schema) +
|
|
64
64
|
"', " + // p_table_schema character varying
|
|
65
65
|
"'" +
|
|
66
66
|
this.tableName +
|
|
@@ -129,6 +129,9 @@ class PostgresModel {
|
|
|
129
129
|
const model = yield this.getSequelizeModelSafely(useTmpTable);
|
|
130
130
|
return model.update(data, opts);
|
|
131
131
|
});
|
|
132
|
+
this.sync = (options) => {
|
|
133
|
+
return this.sequelizeModel.sync(options);
|
|
134
|
+
};
|
|
132
135
|
this.insertOnly = (model, data) => __awaiter(this, void 0, void 0, function* () {
|
|
133
136
|
try {
|
|
134
137
|
if (data instanceof Array) {
|
|
@@ -178,7 +181,8 @@ class PostgresModel {
|
|
|
178
181
|
});
|
|
179
182
|
this.name = name;
|
|
180
183
|
this.tableName = settings.pgTableName;
|
|
181
|
-
this.
|
|
184
|
+
this.schema = settings.pgSchema || "public";
|
|
185
|
+
this.sequelizeModel = connectors_1.PostgresConnector.getConnection().define(settings.pgTableName, settings.outputSequelizeAttributes, Object.assign(Object.assign({}, settings.sequelizeAdditionalSettings), { schema: this.schema }));
|
|
182
186
|
if (settings.hasTmpTable) {
|
|
183
187
|
this.tmpSequelizeModel = connectors_1.PostgresConnector.getConnection().define(settings.pgTableName, settings.outputSequelizeAttributes, Object.assign(Object.assign({}, settings.sequelizeAdditionalSettings), { schema: "tmp" }));
|
|
184
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/PostgresModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA8C;AAE9C,
|
|
1
|
+
{"version":3,"file":"PostgresModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/PostgresModel.ts"],"names":[],"mappings":"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"}
|