prostgles-server 3.0.40 → 3.0.42
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/getColumns.js +1 -1
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.d.ts.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.js +2 -1
- package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
- package/lib/DboBuilder/getColumns.js +2 -2
- package/lib/DboBuilder/getColumns.ts +1 -1
- package/lib/DboBuilder/parseUpdateRules.d.ts.map +1 -1
- package/lib/DboBuilder/parseUpdateRules.js +2 -1
- package/lib/DboBuilder/parseUpdateRules.ts +2 -1
- package/package.json +1 -1
- package/tests/client/PID.txt +1 -1
- package/tests/server/package-lock.json +1 -1
|
@@ -24,7 +24,7 @@ async function getColumns(lang, params, _param3, tableRules, localParams) {
|
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
const { data, filter } = params;
|
|
27
|
-
const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules,
|
|
27
|
+
const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules, localParams);
|
|
28
28
|
dynamicUpdateFields = updateRules.fields;
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getColumns.js","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":";;;AAAA,qDAGyB;AACzB,8CAAyF;AAKlF,MAAM,cAAc,GAAG,CAAC,CAAM,EAAqB,EAAE,CAAC,kBAAkB,IAAI,CAAC,CAAC;AAAxE,QAAA,cAAc,kBAA0D;AAE9E,KAAK,UAAU,UAAU,CAE9B,IAAa,EACb,MAA+D,EAC/D,OAAmB,EACnB,UAAsB,EACtB,WAAyB;IAGzB,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAE1D,IAAI,CAAC,CAAC,CAAC,UAAU;YAAE,MAAM,aAAa,CAAC;QAEvC,sEAAsE;QAGtE,IAAI,mBAAyC,CAAC;QAE9C,IAAI,MAAM,IAAI,UAAU,IAAI,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;YAChD,IACE,CAAC,IAAA,0BAAa,EAAC,MAAM,CAAC;gBACtB,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAA,0BAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC5C,CAAC,IAAA,0BAAa,EAAC,MAAM,CAAC,MAAM,CAAC;gBAC7B,MAAM,CAAC,IAAI,KAAK,QAAQ,EACxB;gBACA,MAAM,4EAA4E,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aAC7G;YAED,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE;gBACvB,mBAAmB,GAAG,EAAE,CAAC;aAC1B;iBAAM;gBACL,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;gBAChC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"getColumns.js","sourceRoot":"","sources":["../../lib/DboBuilder/getColumns.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseUpdateRules.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/parseUpdateRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAc,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;CAC5B,CAAC,
|
|
1
|
+
{"version":3,"file":"parseUpdateRules.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/parseUpdateRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAc,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;CAC5B,CAAC,CAoID"}
|
|
@@ -30,7 +30,8 @@ async function parseUpdateRules(filter, newData, params, tableRules, localParams
|
|
|
30
30
|
finalUpdateFilter = (await this.prepareWhere({ filter, forcedFilter, filterFields, localParams, tableRule: tableRules })).filter;
|
|
31
31
|
if (forcedFilter) {
|
|
32
32
|
const match = await this.findOne(finalUpdateFilter);
|
|
33
|
-
|
|
33
|
+
const requiredItem = await this.findOne(filter);
|
|
34
|
+
if (!match && requiredItem) {
|
|
34
35
|
fields = [];
|
|
35
36
|
}
|
|
36
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseUpdateRules.js","sourceRoot":"","sources":["../../lib/DboBuilder/parseUpdateRules.ts"],"names":[],"mappings":";;;AAAA,qDAAkF;AAKlF;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAEpC,MAAc,EACd,OAAkB,EAClB,MAAqB,EACrB,UAAsB,EACtB,WAAyB;IAUzB,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;YAC5C,MAAM,iFAAiF,CAAC;SACzF;QACD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;KAC1B;IAED,IAAI,YAAY,GAA0B,EAAE,EAC1C,UAAU,GAA0B,EAAE,EACtC,QAAuC,EACvC,eAAe,GAAgB,GAAG,EAClC,YAAY,GAA4B,GAAG,EAC3C,MAAM,GAAgB,GAAG,CAAC;IAE5B,IAAI,iBAAiB,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IAEtC,IAAI,UAAU,EAAE;QACd,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,MAAM,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC;QACtE,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAEnF,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,IAAI,UAAU,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC;QAExF,IAAI,CAAC,eAAe,IAAI,MAAM,EAAE,SAAS,EAAE;YACzC,MAAM,0DAA0D,CAAA;SACjE;QAED,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,6BAA6B,IAAI,CAAC,IAAI,mBAAmB,CAAC;SACjE;QACD,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACjI,IAAI,YAAY,EAAE;YAChB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"parseUpdateRules.js","sourceRoot":"","sources":["../../lib/DboBuilder/parseUpdateRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,11 +24,11 @@ async function getColumns(lang, params, _param3, tableRules, localParams) {
|
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
const { data, filter } = params;
|
|
27
|
-
const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules,
|
|
27
|
+
const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules, localParams);
|
|
28
28
|
dynamicUpdateFields = updateRules.fields;
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
|
|
31
|
+
const columns = this.columns
|
|
32
32
|
.filter(c => {
|
|
33
33
|
const { insert, select, update } = p || {};
|
|
34
34
|
return [
|
|
@@ -42,7 +42,7 @@ export async function getColumns(
|
|
|
42
42
|
dynamicUpdateFields = [];
|
|
43
43
|
} else {
|
|
44
44
|
const { data, filter } = params;
|
|
45
|
-
const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules,
|
|
45
|
+
const updateRules = await this.parseUpdateRules(filter, data, undefined, tableRules, localParams);
|
|
46
46
|
dynamicUpdateFields = updateRules.fields;
|
|
47
47
|
}
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseUpdateRules.d.ts","sourceRoot":"","sources":["parseUpdateRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAc,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;CAC5B,CAAC,
|
|
1
|
+
{"version":3,"file":"parseUpdateRules.d.ts","sourceRoot":"","sources":["parseUpdateRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAc,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;CAC5B,CAAC,CAoID"}
|
|
@@ -30,7 +30,8 @@ async function parseUpdateRules(filter, newData, params, tableRules, localParams
|
|
|
30
30
|
finalUpdateFilter = (await this.prepareWhere({ filter, forcedFilter, filterFields, localParams, tableRule: tableRules })).filter;
|
|
31
31
|
if (forcedFilter) {
|
|
32
32
|
const match = await this.findOne(finalUpdateFilter);
|
|
33
|
-
|
|
33
|
+
const requiredItem = await this.findOne(filter);
|
|
34
|
+
if (!match && requiredItem) {
|
|
34
35
|
fields = [];
|
|
35
36
|
}
|
|
36
37
|
}
|
|
@@ -56,7 +56,8 @@ export async function parseUpdateRules(
|
|
|
56
56
|
finalUpdateFilter = (await this.prepareWhere({ filter, forcedFilter, filterFields, localParams, tableRule: tableRules })).filter;
|
|
57
57
|
if (forcedFilter) {
|
|
58
58
|
const match = await this.findOne(finalUpdateFilter);
|
|
59
|
-
|
|
59
|
+
const requiredItem = await this.findOne(filter);
|
|
60
|
+
if (!match && requiredItem) {
|
|
60
61
|
fields = [];
|
|
61
62
|
}
|
|
62
63
|
}
|
package/package.json
CHANGED
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
18992
|