prostgles-server 2.0.248 → 2.0.251
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/DboBuilder/delete.js +2 -2
- package/dist/DboBuilder/delete.js.map +1 -1
- package/dist/DboBuilder/insert.d.ts +1 -1
- package/dist/DboBuilder/insert.d.ts.map +1 -1
- package/dist/DboBuilder/insert.js +26 -17
- package/dist/DboBuilder/insert.js.map +1 -1
- package/dist/DboBuilder/insertDataParse.d.ts.map +1 -1
- package/dist/DboBuilder/insertDataParse.js +4 -3
- package/dist/DboBuilder/insertDataParse.js.map +1 -1
- package/dist/DboBuilder/update.d.ts.map +1 -1
- package/dist/DboBuilder/update.js +39 -7
- package/dist/DboBuilder/update.js.map +1 -1
- package/dist/DboBuilder.d.ts +6 -3
- package/dist/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder.js +178 -93
- package/dist/DboBuilder.js.map +1 -1
- package/dist/PublishParser.d.ts +7 -1
- package/dist/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser.js.map +1 -1
- package/lib/DboBuilder/delete.js +2 -2
- package/lib/DboBuilder/delete.ts +2 -2
- package/lib/DboBuilder/insert.d.ts +1 -1
- package/lib/DboBuilder/insert.d.ts.map +1 -1
- package/lib/DboBuilder/insert.js +26 -17
- package/lib/DboBuilder/insert.ts +34 -18
- package/lib/DboBuilder/insertDataParse.d.ts.map +1 -1
- package/lib/DboBuilder/insertDataParse.js +4 -3
- package/lib/DboBuilder/insertDataParse.ts +5 -4
- package/lib/DboBuilder/update.d.ts.map +1 -1
- package/lib/DboBuilder/update.js +39 -7
- package/lib/DboBuilder/update.ts +44 -8
- package/lib/DboBuilder.d.ts +6 -3
- package/lib/DboBuilder.d.ts.map +1 -1
- package/lib/DboBuilder.js +178 -93
- package/lib/DboBuilder.ts +207 -98
- package/lib/PublishParser.d.ts +7 -1
- package/lib/PublishParser.d.ts.map +1 -1
- package/lib/PublishParser.ts +7 -1
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/isomorphic_queries.ts +1 -1
- package/tests/server/index.js +9 -1
- package/tests/server/index.ts +9 -1
- package/tests/server/package-lock.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../lib/PublishParser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../lib/PublishParser.ts"],"names":[],"mappings":"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"}
|
package/lib/DboBuilder/delete.js
CHANGED
|
@@ -94,8 +94,8 @@ async function _delete(filter, params, param3_unused, table_rules, localParams)
|
|
|
94
94
|
}
|
|
95
95
|
return undefined;
|
|
96
96
|
};
|
|
97
|
-
if (localParams?.dbTX) {
|
|
98
|
-
return txDelete(localParams.dbTX[this.name]);
|
|
97
|
+
if (localParams?.tx?.dbTX) {
|
|
98
|
+
return txDelete(localParams.tx.dbTX[this.name]);
|
|
99
99
|
}
|
|
100
100
|
else if (this.t) {
|
|
101
101
|
return txDelete(this);
|
package/lib/DboBuilder/delete.ts
CHANGED
|
@@ -105,8 +105,8 @@ export async function _delete(this: TableHandler, filter?: Filter, params?: Dele
|
|
|
105
105
|
return undefined;
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
if (localParams?.dbTX) {
|
|
109
|
-
return txDelete(localParams.dbTX[this.name] as TableHandler)
|
|
108
|
+
if (localParams?.tx?.dbTX) {
|
|
109
|
+
return txDelete(localParams.tx.dbTX[this.name] as TableHandler)
|
|
110
110
|
} else if (this.t) {
|
|
111
111
|
return txDelete(this)
|
|
112
112
|
} else {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AnyObject, InsertParams } from "prostgles-types";
|
|
2
2
|
import { LocalParams, TableHandler } from "../DboBuilder";
|
|
3
3
|
import { TableRule } from "../PublishParser";
|
|
4
|
-
export declare function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: undefined, tableRules?: TableRule,
|
|
4
|
+
export declare function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams): Promise<any | any[] | boolean>;
|
|
5
5
|
//# sourceMappingURL=insert.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["insert.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAqC,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAA+B,WAAW,EAA4B,YAAY,EAAE,MAAM,eAAe,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["insert.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAqC,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAA+B,WAAW,EAA4B,YAAY,EAAE,MAAM,eAAe,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,CAyK1N"}
|
package/lib/DboBuilder/insert.js
CHANGED
|
@@ -3,22 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.insert = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const
|
|
6
|
+
const PubSubManager_1 = require("../PubSubManager");
|
|
7
|
+
async function insert(rowOrRows, param2, param3_unused, tableRules, localParams) {
|
|
8
|
+
// const localParams = _localParams || {};
|
|
9
9
|
try {
|
|
10
10
|
const { onConflictDoNothing, fixIssues = false } = param2 || {};
|
|
11
|
-
let { returning } = param2 || {};
|
|
12
11
|
const { testRule = false, returnQuery = false } = localParams || {};
|
|
13
|
-
|
|
12
|
+
let { returning } = param2 || {};
|
|
13
|
+
const finalDBtx = localParams?.tx?.dbTX || this.dbTX;
|
|
14
14
|
if (tableRules?.insert?.postValidate) {
|
|
15
15
|
if (!finalDBtx) {
|
|
16
|
-
return this.dboBuilder.getTX(_dbtx => _dbtx[this.name]?.insert?.(rowOrRows, param2, param3_unused, tableRules,
|
|
17
|
-
}
|
|
18
|
-
/** Post validate can only access the fields that are accessible to the client */
|
|
19
|
-
returning ?? (returning = {});
|
|
20
|
-
if (returning !== "*") {
|
|
21
|
-
returning["*"] = 1;
|
|
16
|
+
return this.dboBuilder.getTX(_dbtx => _dbtx[this.name]?.insert?.(rowOrRows, param2, param3_unused, tableRules, localParams));
|
|
22
17
|
}
|
|
23
18
|
}
|
|
24
19
|
let returningFields, forcedData, fields;
|
|
@@ -64,7 +59,12 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, _localParams
|
|
|
64
59
|
}
|
|
65
60
|
if (!rowOrRows)
|
|
66
61
|
rowOrRows = {}; //throw "Provide data in param1";
|
|
67
|
-
|
|
62
|
+
const originalReturning = await this.prepareReturning(returning, this.parseFieldFilter(returningFields));
|
|
63
|
+
let fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
|
|
64
|
+
/** Used for postValidate. Add any missing computed returning from original query */
|
|
65
|
+
fullReturning.concat(originalReturning.filter(s => !fullReturning.some(f => f.alias === s.alias)));
|
|
66
|
+
const finalSelect = tableRules?.insert?.postValidate ? fullReturning : originalReturning;
|
|
67
|
+
let returningSelect = this.makeReturnQuery(finalSelect);
|
|
68
68
|
const makeQuery = async (_row, isOne = false) => {
|
|
69
69
|
let row = { ..._row };
|
|
70
70
|
if (!(0, DboBuilder_1.isPojoObject)(row)) {
|
|
@@ -95,18 +95,17 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, _localParams
|
|
|
95
95
|
return insertResult;
|
|
96
96
|
}
|
|
97
97
|
if (Array.isArray(data)) {
|
|
98
|
-
// if(returning) throw "Sorry but [returning] is dissalowed for multi insert";
|
|
99
98
|
let queries = await Promise.all(data.map(async (p) => {
|
|
100
99
|
const q = await makeQuery(p);
|
|
101
100
|
return q;
|
|
102
101
|
}));
|
|
103
102
|
query = DboBuilder_1.pgp.helpers.concat(queries);
|
|
104
|
-
if (
|
|
103
|
+
if (returningSelect)
|
|
105
104
|
queryType = "many";
|
|
106
105
|
}
|
|
107
106
|
else {
|
|
108
107
|
query = await makeQuery(data, true);
|
|
109
|
-
if (
|
|
108
|
+
if (returningSelect)
|
|
110
109
|
queryType = "one";
|
|
111
110
|
}
|
|
112
111
|
if (returnQuery)
|
|
@@ -115,7 +114,7 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, _localParams
|
|
|
115
114
|
if (this.dboBuilder.prostgles.opts.DEBUG_MODE) {
|
|
116
115
|
console.log(this.t?.ctx?.start, "insert in " + this.name, data);
|
|
117
116
|
}
|
|
118
|
-
const tx =
|
|
117
|
+
const tx = localParams?.tx?.t || this.t;
|
|
119
118
|
const allowedFieldKeys = this.parseFieldFilter(fields);
|
|
120
119
|
if (tx) {
|
|
121
120
|
result = await tx[queryType](query).catch((err) => (0, DboBuilder_1.makeErr)(err, localParams, this, allowedFieldKeys));
|
|
@@ -126,10 +125,20 @@ async function insert(rowOrRows, param2, param3_unused, tableRules, _localParams
|
|
|
126
125
|
if (tableRules?.insert?.postValidate) {
|
|
127
126
|
if (!finalDBtx)
|
|
128
127
|
throw new Error("Unexpected: no dbTX for postValidate");
|
|
129
|
-
const rows = Array.isArray(
|
|
128
|
+
const rows = Array.isArray(result) ? result : [result];
|
|
130
129
|
for await (const row of rows) {
|
|
131
130
|
await tableRules?.insert?.postValidate(row ?? {}, finalDBtx);
|
|
132
131
|
}
|
|
132
|
+
/* We used a full returning for postValidate. Now we must filter out dissallowed columns */
|
|
133
|
+
if (returning) {
|
|
134
|
+
if (Array.isArray(result)) {
|
|
135
|
+
return result.map(row => {
|
|
136
|
+
(0, PubSubManager_1.pickKeys)(row, originalReturning.map(s => s.alias));
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
return (0, PubSubManager_1.pickKeys)(result, originalReturning.map(s => s.alias));
|
|
140
|
+
}
|
|
141
|
+
return undefined;
|
|
133
142
|
}
|
|
134
143
|
return result;
|
|
135
144
|
}
|
package/lib/DboBuilder/insert.ts
CHANGED
|
@@ -2,25 +2,21 @@ import pgPromise from "pg-promise";
|
|
|
2
2
|
import { AnyObject, asName, FieldFilter, get, getKeys, InsertParams, isObject } from "prostgles-types";
|
|
3
3
|
import { isPlainObject, isPojoObject, LocalParams, makeErr, parseError, pgp, TableHandler } from "../DboBuilder";
|
|
4
4
|
import { TableRule } from "../PublishParser";
|
|
5
|
+
import { omitKeys, pickKeys } from "../PubSubManager";
|
|
5
6
|
|
|
6
|
-
export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: undefined, tableRules?: TableRule,
|
|
7
|
-
const localParams = _localParams || {};
|
|
8
|
-
|
|
7
|
+
export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams): Promise<any | any[] | boolean> {
|
|
8
|
+
// const localParams = _localParams || {};
|
|
9
|
+
|
|
9
10
|
try {
|
|
10
11
|
|
|
11
12
|
const { onConflictDoNothing, fixIssues = false } = param2 || {};
|
|
12
|
-
let { returning } = param2 || {};
|
|
13
13
|
const { testRule = false, returnQuery = false } = localParams || {};
|
|
14
|
-
|
|
14
|
+
|
|
15
|
+
let { returning } = param2 || {};
|
|
16
|
+
const finalDBtx = localParams?.tx?.dbTX || this.dbTX;
|
|
15
17
|
if(tableRules?.insert?.postValidate ){
|
|
16
18
|
if(!finalDBtx){
|
|
17
|
-
return this.dboBuilder.getTX(_dbtx => _dbtx[this.name]?.insert?.(rowOrRows, param2, param3_unused, tableRules,
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
/** Post validate can only access the fields that are accessible to the client */
|
|
21
|
-
returning ??= {};
|
|
22
|
-
if(returning !== "*"){
|
|
23
|
-
returning["*"] = 1;
|
|
19
|
+
return this.dboBuilder.getTX(_dbtx => _dbtx[this.name]?.insert?.(rowOrRows, param2, param3_unused, tableRules, localParams))
|
|
24
20
|
}
|
|
25
21
|
}
|
|
26
22
|
|
|
@@ -73,7 +69,16 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
|
|
|
73
69
|
}
|
|
74
70
|
|
|
75
71
|
if (!rowOrRows) rowOrRows = {}; //throw "Provide data in param1";
|
|
76
|
-
|
|
72
|
+
|
|
73
|
+
const originalReturning = await this.prepareReturning(returning, this.parseFieldFilter(returningFields))
|
|
74
|
+
let fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
|
|
75
|
+
|
|
76
|
+
/** Used for postValidate. Add any missing computed returning from original query */
|
|
77
|
+
fullReturning.concat(originalReturning.filter(s => !fullReturning.some(f => f.alias === s.alias)));
|
|
78
|
+
|
|
79
|
+
const finalSelect = tableRules?.insert?.postValidate? fullReturning : originalReturning;
|
|
80
|
+
let returningSelect = this.makeReturnQuery(finalSelect);
|
|
81
|
+
|
|
77
82
|
const makeQuery = async (_row: AnyObject | undefined, isOne = false) => {
|
|
78
83
|
let row = { ..._row };
|
|
79
84
|
|
|
@@ -109,17 +114,16 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
|
|
|
109
114
|
}
|
|
110
115
|
|
|
111
116
|
if (Array.isArray(data)) {
|
|
112
|
-
// if(returning) throw "Sorry but [returning] is dissalowed for multi insert";
|
|
113
117
|
let queries = await Promise.all(data.map(async p => {
|
|
114
118
|
const q = await makeQuery(p);
|
|
115
119
|
return q;
|
|
116
120
|
}));
|
|
117
121
|
|
|
118
122
|
query = pgp.helpers.concat(queries);
|
|
119
|
-
if (
|
|
123
|
+
if (returningSelect) queryType = "many";
|
|
120
124
|
} else {
|
|
121
125
|
query = await makeQuery(data, true);
|
|
122
|
-
if (
|
|
126
|
+
if (returningSelect) queryType = "one";
|
|
123
127
|
}
|
|
124
128
|
|
|
125
129
|
if (returnQuery) return query;
|
|
@@ -129,7 +133,7 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
|
|
|
129
133
|
console.log(this.t?.ctx?.start, "insert in " + this.name, data);
|
|
130
134
|
}
|
|
131
135
|
|
|
132
|
-
const tx =
|
|
136
|
+
const tx = localParams?.tx?.t || this.t;
|
|
133
137
|
|
|
134
138
|
const allowedFieldKeys = this.parseFieldFilter(fields);
|
|
135
139
|
if (tx) {
|
|
@@ -140,10 +144,22 @@ export async function insert(this: TableHandler, rowOrRows: (AnyObject | AnyObje
|
|
|
140
144
|
|
|
141
145
|
if(tableRules?.insert?.postValidate){
|
|
142
146
|
if(!finalDBtx) throw new Error("Unexpected: no dbTX for postValidate");
|
|
143
|
-
const rows = Array.isArray(
|
|
147
|
+
const rows = Array.isArray(result)? result : [result];
|
|
144
148
|
for await (const row of rows){
|
|
145
149
|
await tableRules?.insert?.postValidate(row ?? {}, finalDBtx)
|
|
146
150
|
}
|
|
151
|
+
|
|
152
|
+
/* We used a full returning for postValidate. Now we must filter out dissallowed columns */
|
|
153
|
+
if(returning){
|
|
154
|
+
if(Array.isArray(result)){
|
|
155
|
+
return result.map(row => {
|
|
156
|
+
pickKeys(row, originalReturning.map(s => s.alias))
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
return pickKeys(result, originalReturning.map(s => s.alias))
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
return undefined;
|
|
147
163
|
}
|
|
148
164
|
|
|
149
165
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertDataParse.d.ts","sourceRoot":"","sources":["insertDataParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqC,YAAY,EAAgD,MAAM,iBAAiB,CAAC;AAC3I,OAAO,EAA4B,WAAW,EAAmC,YAAY,EAAiB,MAAM,eAAe,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAC/B,MAAM,CAAC,EAAE,YAAY,EACrB,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC;IACT,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;CACxC,CAAC,
|
|
1
|
+
{"version":3,"file":"insertDataParse.d.ts","sourceRoot":"","sources":["insertDataParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqC,YAAY,EAAgD,MAAM,iBAAiB,CAAC;AAC3I,OAAO,EAA4B,WAAW,EAAmC,YAAY,EAAiB,MAAM,eAAe,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAC/B,MAAM,CAAC,EAAE,YAAY,EACrB,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC;IACT,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;CACxC,CAAC,CA6PD"}
|
|
@@ -10,7 +10,6 @@ const uploadFile_1 = require("./uploadFile");
|
|
|
10
10
|
*/
|
|
11
11
|
async function insertDataParse(data, param2, param3_unused, tableRules, _localParams) {
|
|
12
12
|
const localParams = _localParams || {};
|
|
13
|
-
let dbTX = localParams?.dbTX || this.dbTX;
|
|
14
13
|
const MEDIA_COL_NAMES = ["data", "name"];
|
|
15
14
|
const isMultiInsert = Array.isArray(data);
|
|
16
15
|
const getExtraKeys = (d) => (0, prostgles_types_1.getKeys)(d).filter(k => {
|
|
@@ -65,9 +64,11 @@ async function insertDataParse(data, param2, param3_unused, tableRules, _localPa
|
|
|
65
64
|
/**
|
|
66
65
|
* Make sure nested insert uses a transaction
|
|
67
66
|
*/
|
|
68
|
-
|
|
67
|
+
const dbTX = localParams?.tx?.dbTX || this.dbTX;
|
|
68
|
+
const t = localParams?.tx?.t || this.t;
|
|
69
|
+
if (isNestedInsert && (!dbTX || !t)) {
|
|
69
70
|
return {
|
|
70
|
-
insertResult: await this.dboBuilder.getTX((dbTX) => dbTX[this.name].insert(data, param2, param3_unused, tableRules, { dbTX, ...localParams }))
|
|
71
|
+
insertResult: await this.dboBuilder.getTX((dbTX, _t) => dbTX[this.name].insert(data, param2, param3_unused, tableRules, { tx: { dbTX, t: _t }, ...localParams }))
|
|
71
72
|
};
|
|
72
73
|
}
|
|
73
74
|
// if(!dbTX && this.t) dbTX = this.d;
|
|
@@ -19,7 +19,6 @@ export async function insertDataParse(
|
|
|
19
19
|
insertResult?: AnyObject | AnyObject[];
|
|
20
20
|
}> {
|
|
21
21
|
const localParams = _localParams || {};
|
|
22
|
-
let dbTX = localParams?.dbTX || this.dbTX;
|
|
23
22
|
const MEDIA_COL_NAMES = ["data", "name"];
|
|
24
23
|
|
|
25
24
|
const isMultiInsert = Array.isArray(data);
|
|
@@ -80,15 +79,17 @@ export async function insertDataParse(
|
|
|
80
79
|
/**
|
|
81
80
|
* Make sure nested insert uses a transaction
|
|
82
81
|
*/
|
|
83
|
-
|
|
82
|
+
const dbTX = localParams?.tx?.dbTX || this.dbTX;
|
|
83
|
+
const t = localParams?.tx?.t || this.t;
|
|
84
|
+
if (isNestedInsert && (!dbTX || !t)) {
|
|
84
85
|
return {
|
|
85
|
-
insertResult: await this.dboBuilder.getTX((dbTX) =>
|
|
86
|
+
insertResult: await this.dboBuilder.getTX((dbTX, _t) =>
|
|
86
87
|
(dbTX[this.name] as TableHandler).insert(
|
|
87
88
|
data,
|
|
88
89
|
param2,
|
|
89
90
|
param3_unused,
|
|
90
91
|
tableRules,
|
|
91
|
-
{ dbTX, ...localParams }
|
|
92
|
+
{ tx: { dbTX, t: _t }, ...localParams }
|
|
92
93
|
)
|
|
93
94
|
)
|
|
94
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkC,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAiB,WAAW,EAA8B,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAE,SAAS,EAAe,MAAM,kBAAkB,CAAC;AAI1D,wBAAsB,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkC,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAE,MAAM,EAAiB,WAAW,EAA8B,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAE,SAAS,EAAe,MAAM,kBAAkB,CAAC;AAI1D,wBAAsB,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA8JzL"}
|
package/lib/DboBuilder/update.js
CHANGED
|
@@ -7,9 +7,15 @@ const PubSubManager_1 = require("../PubSubManager");
|
|
|
7
7
|
const uploadFile_1 = require("./uploadFile");
|
|
8
8
|
async function update(filter, _newData, params, tableRules, localParams) {
|
|
9
9
|
try {
|
|
10
|
-
|
|
10
|
+
/** postValidate */
|
|
11
|
+
const finalDBtx = localParams?.tx?.dbTX || this.dbTX;
|
|
12
|
+
if (tableRules?.update?.postValidate) {
|
|
13
|
+
if (!finalDBtx) {
|
|
14
|
+
return this.dboBuilder.getTX(_dbtx => _dbtx[this.name]?.update?.(filter, _newData, params, tableRules, localParams));
|
|
15
|
+
}
|
|
16
|
+
}
|
|
11
17
|
let newData = _newData;
|
|
12
|
-
if (this.is_media && (0, uploadFile_1.isFile)(newData) && (!tableRules || tableRules.
|
|
18
|
+
if (this.is_media && (0, uploadFile_1.isFile)(newData) && (!tableRules || tableRules.update)) {
|
|
13
19
|
let existingMediaId = !(!filter || !(0, prostgles_types_1.isObject)(filter) || (0, prostgles_types_1.getKeys)(filter).join() !== "id" || typeof filter.id !== "string") ? filter.id : undefined;
|
|
14
20
|
if (!existingMediaId) {
|
|
15
21
|
throw new Error(`Updating the file table with file data can only be done by providing a single id filter. E.g. { id: "9ea4e23c-2b1a-4e33-8ec0-c15919bb45ec"} `);
|
|
@@ -24,7 +30,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
24
30
|
const validate = tableRules?.update?.validate ? async (row) => {
|
|
25
31
|
return tableRules?.update?.validate({ update: row, filter }, this.dbTX || this.dboBuilder.dbo);
|
|
26
32
|
} : undefined;
|
|
27
|
-
let existingFile = await (localParams?.dbTX?.[this.name] || this).findOne({ id: existingMediaId });
|
|
33
|
+
let existingFile = await (localParams?.tx?.dbTX?.[this.name] || this).findOne({ id: existingMediaId });
|
|
28
34
|
if (!existingFile?.name)
|
|
29
35
|
throw new Error("Existing file record not found");
|
|
30
36
|
// oldFileDelete = () => fileManager.deleteFile(existingFile!.name!)
|
|
@@ -40,8 +46,8 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
40
46
|
if (localParams?.testRule) {
|
|
41
47
|
return parsedRules;
|
|
42
48
|
}
|
|
43
|
-
const { fields, validateRow, forcedData,
|
|
44
|
-
|
|
49
|
+
const { fields, validateRow, forcedData, returningFields, forcedFilter, filterFields } = parsedRules;
|
|
50
|
+
const { returning, multi = true, onConflictDoNothing = false, fixIssues = false } = params || {};
|
|
45
51
|
const { returnQuery = false } = localParams ?? {};
|
|
46
52
|
if (params) {
|
|
47
53
|
const good_params = ["returning", "multi", "onConflictDoNothing", "fixIssues"];
|
|
@@ -85,10 +91,17 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
85
91
|
})).where;
|
|
86
92
|
if (onConflictDoNothing)
|
|
87
93
|
query += " ON CONFLICT DO NOTHING ";
|
|
94
|
+
/** postValidate */
|
|
95
|
+
const originalReturning = await this.prepareReturning(returning, this.parseFieldFilter(returningFields));
|
|
96
|
+
let fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
|
|
97
|
+
/** Used for postValidate. Add any missing computed returning from original query */
|
|
98
|
+
fullReturning.concat(originalReturning.filter(s => !fullReturning.some(f => f.alias === s.alias)));
|
|
99
|
+
const finalSelect = tableRules?.insert?.postValidate ? fullReturning : originalReturning;
|
|
100
|
+
const returningSelect = this.makeReturnQuery(finalSelect);
|
|
88
101
|
let qType = "none";
|
|
89
|
-
if (
|
|
102
|
+
if (returningSelect) {
|
|
90
103
|
qType = multi ? "any" : "one";
|
|
91
|
-
query +=
|
|
104
|
+
query += returningSelect;
|
|
92
105
|
}
|
|
93
106
|
if (returnQuery)
|
|
94
107
|
return query;
|
|
@@ -101,6 +114,25 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
101
114
|
}
|
|
102
115
|
/** TODO: Delete old file at the end in case new file update fails */
|
|
103
116
|
// await oldFileDelete();
|
|
117
|
+
/** postValidate */
|
|
118
|
+
if (tableRules?.insert?.postValidate) {
|
|
119
|
+
if (!finalDBtx)
|
|
120
|
+
throw new Error("Unexpected: no dbTX for postValidate");
|
|
121
|
+
const rows = Array.isArray(result) ? result : [result];
|
|
122
|
+
for await (const row of rows) {
|
|
123
|
+
await tableRules?.insert?.postValidate(row ?? {}, finalDBtx);
|
|
124
|
+
}
|
|
125
|
+
/* We used a full returning for postValidate. Now we must filter out dissallowed columns */
|
|
126
|
+
if (returningSelect) {
|
|
127
|
+
if (Array.isArray(result)) {
|
|
128
|
+
return result.map(row => {
|
|
129
|
+
(0, PubSubManager_1.pickKeys)(row, originalReturning.map(s => s.alias));
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
return (0, PubSubManager_1.pickKeys)(result, originalReturning.map(s => s.alias));
|
|
133
|
+
}
|
|
134
|
+
return undefined;
|
|
135
|
+
}
|
|
104
136
|
return result;
|
|
105
137
|
}
|
|
106
138
|
catch (e) {
|
package/lib/DboBuilder/update.ts
CHANGED
|
@@ -1,16 +1,22 @@
|
|
|
1
1
|
import { AnyObject, getKeys, isObject, unpatchText, UpdateParams } from "prostgles-types";
|
|
2
2
|
import { Filter, isPlainObject, LocalParams, makeErr, Media, parseError, TableHandler } from "../DboBuilder";
|
|
3
3
|
import { TableRule, ValidateRow } from "../PublishParser";
|
|
4
|
-
import { omitKeys } from "../PubSubManager";
|
|
4
|
+
import { omitKeys, pickKeys } from "../PubSubManager";
|
|
5
5
|
import { isFile, uploadFile } from "./uploadFile"
|
|
6
6
|
|
|
7
7
|
export async function update(this: TableHandler, filter: Filter, _newData: AnyObject, params?: UpdateParams, tableRules?: TableRule, localParams?: LocalParams): Promise<AnyObject | void> {
|
|
8
8
|
try {
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
/** postValidate */
|
|
11
|
+
const finalDBtx = localParams?.tx?.dbTX || this.dbTX;
|
|
12
|
+
if(tableRules?.update?.postValidate ){
|
|
13
|
+
if(!finalDBtx){
|
|
14
|
+
return this.dboBuilder.getTX(_dbtx => _dbtx[this.name]?.update?.(filter, _newData, params, tableRules, localParams))
|
|
15
|
+
}
|
|
16
|
+
}
|
|
11
17
|
|
|
12
18
|
let newData = _newData;
|
|
13
|
-
if(this.is_media && isFile(newData) && (!tableRules || tableRules.
|
|
19
|
+
if(this.is_media && isFile(newData) && (!tableRules || tableRules.update)){
|
|
14
20
|
let existingMediaId: string = !(!filter || !isObject(filter) || getKeys(filter).join() !== "id" || typeof (filter as any).id !== "string")? (filter as any).id : undefined
|
|
15
21
|
if(!existingMediaId){
|
|
16
22
|
throw new Error(`Updating the file table with file data can only be done by providing a single id filter. E.g. { id: "9ea4e23c-2b1a-4e33-8ec0-c15919bb45ec"} `);
|
|
@@ -24,7 +30,7 @@ export async function update(this: TableHandler, filter: Filter, _newData: AnyOb
|
|
|
24
30
|
return tableRules?.update?.validate!({ update: row, filter }, this.dbTX || this.dboBuilder.dbo)
|
|
25
31
|
} : undefined;
|
|
26
32
|
|
|
27
|
-
let existingFile: Media | undefined = await (localParams?.dbTX?.[this.name] as TableHandler || this).findOne({ id: existingMediaId });
|
|
33
|
+
let existingFile: Media | undefined = await (localParams?.tx?.dbTX?.[this.name] as TableHandler || this).findOne({ id: existingMediaId });
|
|
28
34
|
|
|
29
35
|
if(!existingFile?.name) throw new Error("Existing file record not found");
|
|
30
36
|
|
|
@@ -42,10 +48,10 @@ export async function update(this: TableHandler, filter: Filter, _newData: AnyOb
|
|
|
42
48
|
return parsedRules;
|
|
43
49
|
}
|
|
44
50
|
|
|
45
|
-
const { fields, validateRow, forcedData,
|
|
51
|
+
const { fields, validateRow, forcedData, returningFields, forcedFilter, filterFields } = parsedRules;
|
|
46
52
|
|
|
47
53
|
|
|
48
|
-
|
|
54
|
+
const { returning, multi = true, onConflictDoNothing = false, fixIssues = false } = params || {};
|
|
49
55
|
const { returnQuery = false } = localParams ?? {};
|
|
50
56
|
|
|
51
57
|
|
|
@@ -102,10 +108,19 @@ export async function update(this: TableHandler, filter: Filter, _newData: AnyOb
|
|
|
102
108
|
})).where;
|
|
103
109
|
if (onConflictDoNothing) query += " ON CONFLICT DO NOTHING ";
|
|
104
110
|
|
|
111
|
+
|
|
112
|
+
/** postValidate */
|
|
113
|
+
const originalReturning = await this.prepareReturning(returning, this.parseFieldFilter(returningFields))
|
|
114
|
+
let fullReturning = await this.prepareReturning(returning, this.parseFieldFilter("*"));
|
|
115
|
+
/** Used for postValidate. Add any missing computed returning from original query */
|
|
116
|
+
fullReturning.concat(originalReturning.filter(s => !fullReturning.some(f => f.alias === s.alias)));
|
|
117
|
+
const finalSelect = tableRules?.insert?.postValidate? fullReturning : originalReturning;
|
|
118
|
+
const returningSelect = this.makeReturnQuery(finalSelect);
|
|
119
|
+
|
|
105
120
|
let qType: "none" | "any" | "one" = "none";
|
|
106
|
-
if (
|
|
121
|
+
if (returningSelect) {
|
|
107
122
|
qType = multi ? "any" : "one";
|
|
108
|
-
query +=
|
|
123
|
+
query += returningSelect;
|
|
109
124
|
}
|
|
110
125
|
|
|
111
126
|
if (returnQuery) return query as unknown as void;
|
|
@@ -120,6 +135,27 @@ export async function update(this: TableHandler, filter: Filter, _newData: AnyOb
|
|
|
120
135
|
/** TODO: Delete old file at the end in case new file update fails */
|
|
121
136
|
// await oldFileDelete();
|
|
122
137
|
|
|
138
|
+
/** postValidate */
|
|
139
|
+
if(tableRules?.insert?.postValidate){
|
|
140
|
+
if(!finalDBtx) throw new Error("Unexpected: no dbTX for postValidate");
|
|
141
|
+
const rows = Array.isArray(result)? result : [result];
|
|
142
|
+
for await (const row of rows){
|
|
143
|
+
await tableRules?.insert?.postValidate(row ?? {}, finalDBtx)
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
/* We used a full returning for postValidate. Now we must filter out dissallowed columns */
|
|
147
|
+
if(returningSelect){
|
|
148
|
+
if(Array.isArray(result)){
|
|
149
|
+
return result.map(row => {
|
|
150
|
+
pickKeys(row, originalReturning.map(s => s.alias))
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
return pickKeys(result, originalReturning.map(s => s.alias))
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
return undefined;
|
|
157
|
+
}
|
|
158
|
+
|
|
123
159
|
return result;
|
|
124
160
|
|
|
125
161
|
} catch (e) {
|
package/lib/DboBuilder.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as pgPromise from 'pg-promise';
|
|
2
2
|
import pg = require('pg-promise/typescript/pg-subset');
|
|
3
|
-
import { ColumnInfo, ValidatedColumnInfo, FieldFilter, SelectParams, SubscribeParams, OrderBy, InsertParams, UpdateParams, DeleteParams, DbJoinMaker, PG_COLUMN_UDT_DATA_TYPE, TS_PG_Types, TableInfo as TInfo, SQLHandler, AnyObject, Select } from "prostgles-types";
|
|
3
|
+
import { ColumnInfo, ValidatedColumnInfo, FieldFilter, SelectParams, SubscribeParams, OrderBy, InsertParams, UpdateParams, DeleteParams, SQLOptions, DbJoinMaker, PG_COLUMN_UDT_DATA_TYPE, TS_PG_Types, TableInfo as TInfo, SQLHandler, AnyObject, Select } from "prostgles-types";
|
|
4
4
|
export declare type Media = {
|
|
5
5
|
"id"?: string;
|
|
6
6
|
"title"?: string;
|
|
@@ -80,8 +80,10 @@ export declare type LocalParams = {
|
|
|
80
80
|
has_rules?: boolean;
|
|
81
81
|
testRule?: boolean;
|
|
82
82
|
tableAlias?: string;
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
tx?: {
|
|
84
|
+
dbTX: TableHandlers;
|
|
85
|
+
t: pgPromise.ITask<{}>;
|
|
86
|
+
};
|
|
85
87
|
returnQuery?: boolean;
|
|
86
88
|
nestedInsert?: {
|
|
87
89
|
depth: number;
|
|
@@ -386,6 +388,7 @@ export declare class DboBuilder {
|
|
|
386
388
|
getJoins(): Join[];
|
|
387
389
|
getJoinPaths(): JoinPaths;
|
|
388
390
|
parseJoins(): Promise<JoinPaths>;
|
|
391
|
+
runSQL: (query: string, params: any, options: SQLOptions | undefined, localParams?: LocalParams) => Promise<any>;
|
|
389
392
|
build(): Promise<DBHandlerServer>;
|
|
390
393
|
getTX: (cb: TxCB) => Promise<any>;
|
|
391
394
|
}
|