prostgles-server 4.1.77 → 4.1.80
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/QueryBuilder/QueryBuilder.d.ts +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +3 -6
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/find.d.ts.map +1 -1
- package/dist/DboBuilder/find.js +2 -3
- package/dist/DboBuilder/find.js.map +1 -1
- package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +1 -1
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +1 -1
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +3 -8
- package/lib/DboBuilder/find.ts +3 -4
- package/package.json +2 -2
- package/tests/client/PID.txt +1 -1
- package/tests/client/package-lock.json +15 -15
- package/tests/client/package.json +1 -1
- package/tests/server/package-lock.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/QueryBuilder.ts"],"names":[],"mappings":"AAMA,OAAO,EAAmC,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAmB,UAAU,EAAE,uBAAuB,EAAY,MAAM,EAAE,UAAU,EAAW,mBAAmB,EAAe,MAAM,iBAAiB,CAAC;AAEhK,OAAO,EAAmB,SAAS,EAAa,YAAY,EAAiB,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IACvB,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,GAAG,GAAG,CAAC;IAC5C,QAAQ,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C,UAAU,CAAC,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAA;IAE9C,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,CAAC;IACH,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG;IACF,IAAI,EAAE,UAAU,GAAG,aAAa,GAAG,cAAc,GAAG,UAAU,CAAC;IAC/D,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB,CAAC,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;CAAE,CAAA;AAEpE,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,MAAM,EAAE,UAAU,EAAE,CAAC;IAErB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAC5D,YAAY,EAAE,QAAQ,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/QueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { Filter, LocalParams } from "../../DboBuilder";
|
|
|
4
4
|
import { RawJoinPath } from "prostgles-types";
|
|
5
5
|
import { NewQuery } from "./QueryBuilder";
|
|
6
6
|
export declare function getNewQuery(_this: TableHandler, filter: Filter, selectParams: ({
|
|
7
|
-
limit?: number | undefined;
|
|
7
|
+
limit?: number | null | undefined;
|
|
8
8
|
offset?: number | undefined;
|
|
9
9
|
groupBy?: boolean | undefined;
|
|
10
10
|
returnType?: "values" | "value" | "row" | "statement" | undefined;
|
|
@@ -65,7 +65,7 @@ function getSelectQuery(viewHandler, q, depth = 0, selectParamsGroupBy) {
|
|
|
65
65
|
...(0, exports.getRootGroupBy)(q, selectParamsGroupBy),
|
|
66
66
|
...(0, DboBuilder_1.prepareOrderByQuery)(q.orderByItems),
|
|
67
67
|
...(q.having ? [`HAVING ${q.having} `] : []),
|
|
68
|
-
...(depth ? [] : [`LIMIT ${q.limit || 0}`]),
|
|
68
|
+
...(depth || q.limit === null ? [] : [`LIMIT ${q.limit || 0}`]),
|
|
69
69
|
...(q.offset ? [`OFFSET ${q.offset || 0}`] : [])
|
|
70
70
|
];
|
|
71
71
|
return indentLinesToString(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getSelectQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getSelectQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,7 @@ export declare class ViewHandler {
|
|
|
87
87
|
filter: AnyObject;
|
|
88
88
|
exists: import("../../DboBuilder").ExistsFilterConfig[];
|
|
89
89
|
}>;
|
|
90
|
-
prepareLimitQuery(limit: number | undefined, p: ValidatedTableRules): number;
|
|
90
|
+
prepareLimitQuery(limit: number | null | undefined, p: ValidatedTableRules): number | null;
|
|
91
91
|
prepareOffsetQuery(offset?: number): number;
|
|
92
92
|
intersectColumns(allowedFields: FieldFilter, dissallowedFields: FieldFilter, fixIssues?: boolean): string[];
|
|
93
93
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -138,7 +138,7 @@ class ViewHandler {
|
|
|
138
138
|
if (!tableRules.select.fields)
|
|
139
139
|
return throwFieldsErr("select");
|
|
140
140
|
let maxLimit = null;
|
|
141
|
-
if (tableRules.select.maxLimit !== undefined && tableRules.select.maxLimit !== maxLimit) {
|
|
141
|
+
if (!localParams?.bypassLimit && tableRules.select.maxLimit !== undefined && tableRules.select.maxLimit !== maxLimit) {
|
|
142
142
|
const ml = tableRules.select.maxLimit;
|
|
143
143
|
if (ml !== null && (!Number.isInteger(ml) || ml < 0))
|
|
144
144
|
throw ` Invalid publish.${this.name}.select.maxLimit -> expecting a positive integer OR null but got ` + ml;
|
|
@@ -320,21 +320,18 @@ class ViewHandler {
|
|
|
320
320
|
*/
|
|
321
321
|
prepareWhere = prepareWhere_1.prepareWhere.bind(this);
|
|
322
322
|
/* This relates only to SELECT */
|
|
323
|
-
prepareLimitQuery(limit =
|
|
323
|
+
prepareLimitQuery(limit = null, p) {
|
|
324
324
|
if (limit !== undefined && limit !== null && !Number.isInteger(limit)) {
|
|
325
325
|
throw "Unexpected LIMIT. Must be null or an integer";
|
|
326
326
|
}
|
|
327
327
|
let _limit = limit;
|
|
328
|
-
// if(_limit === undefined && p.select.maxLimit === null){
|
|
329
|
-
// _limit = 1000;
|
|
330
328
|
/* If no limit then set as the lesser of (100, maxLimit) */
|
|
331
|
-
// } else
|
|
332
329
|
if (_limit !== null && !Number.isInteger(_limit) && p.select.maxLimit !== null) {
|
|
333
330
|
_limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0];
|
|
334
331
|
}
|
|
335
332
|
else {
|
|
336
333
|
/* If a limit higher than maxLimit specified throw error */
|
|
337
|
-
if (Number.isInteger(p.select.maxLimit) && _limit > p.select.maxLimit) {
|
|
334
|
+
if (Number.isInteger(p.select.maxLimit) && _limit !== null && _limit > p.select.maxLimit) {
|
|
338
335
|
throw `Unexpected LIMIT ${_limit}. Must be less than the published maxLimit: ` + p.select.maxLimit;
|
|
339
336
|
}
|
|
340
337
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAiD,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAiD,MAAM,eAAe,CAAC;AAEnG,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,eAAO,MAAM,IAAI,SAAwB,WAAW,WAAW,MAAM,iBAAiB,YAAY,kBAAkB,SAAS,eAAe,SAAS,gBAAgB,WAAW,KAAG,QAAQ,GAAG,EAAE,CAyE/L,CAAA;AAGD,eAAO,MAAM,kBAAkB,UAAiB,MAAM,cAAc,YAAY,CAAC,YAAY,CAAC,WAAW,WAAW,GAAG,YAAY,eAAe,WAAW,GAAG,SAAS,iBAoBxK,CAAA"}
|
package/dist/DboBuilder/find.js
CHANGED
|
@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runQueryReturnType = exports.find = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
|
-
const getSelectQuery_1 = require("./QueryBuilder/getSelectQuery");
|
|
7
6
|
const runSQL_1 = require("../DboBuilder/runSQL");
|
|
8
7
|
const getNewQuery_1 = require("./QueryBuilder/getNewQuery");
|
|
9
|
-
const
|
|
8
|
+
const getSelectQuery_1 = require("./QueryBuilder/getSelectQuery");
|
|
10
9
|
const find = async function (filter, selectParams, param3_unused, tableRules, localParams) {
|
|
11
10
|
try {
|
|
12
11
|
await this._log({ command: "find", localParams, data: { filter, selectParams } });
|
|
@@ -39,7 +38,7 @@ const find = async function (filter, selectParams, param3_unused, tableRules, lo
|
|
|
39
38
|
throw ` invalid publish.${this.name}.select.maxLimit -> expecting integer but got ` + maxLimit;
|
|
40
39
|
}
|
|
41
40
|
const _selectParams = selectParams ?? {};
|
|
42
|
-
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit) ?
|
|
41
|
+
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit) ? { ..._selectParams, limit: null } : { limit: 1000, ..._selectParams };
|
|
43
42
|
const q = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParamsLimitCheck, param3_unused, tableRules, localParams);
|
|
44
43
|
const queryWithoutRLS = (0, getSelectQuery_1.getSelectQuery)(this, q, undefined, !!selectParamsLimitCheck?.groupBy);
|
|
45
44
|
const queryWithRLS = (0, DboBuilder_1.withUserRLS)(localParams, queryWithoutRLS);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":";;;AACA,qDAAyD;AACzD,8CAAmG;AACnG,
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../lib/DboBuilder/find.ts"],"names":[],"mappings":";;;AACA,qDAAyD;AACzD,8CAAmG;AACnG,iDAAiD;AAEjD,4DAAyD;AACzD,kEAA+D;AAIxD,MAAM,IAAI,GAAG,KAAK,WAA6B,MAAe,EAAE,YAA2B,EAAE,aAAyB,EAAE,UAAsB,EAAE,WAAyB;IAC9K,IAAI;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,MAAM,kBAAkB,GAAsC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QACrG,MAAM,EAAE,UAAU,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;QAC1C,IAAI,UAAU,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC1D,MAAM,eAAe,UAAU,iBAAiB,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;SAClF;QAED,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK,EAAE,cAAc,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QAEzG,IAAI,QAAQ;YAAE,OAAO,EAAE,CAAC;QACxB,IAAI,YAAY,EAAE;YAChB,MAAM,WAAW,GAA8B,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;YACjH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAQ,CAAC,CAAC,CAAC;YAC1F,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM;gBAAE,MAAM,kBAAkB,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpI;QAED,sBAAsB;QACtB,IAAI,UAAU,EAAE;YAEd,IAAI,CAAC,UAAU,CAAC,MAAM;gBAAE,MAAM,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC;YACtE,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;YACxC,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;YAE5C,IAAS,UAAU,CAAC,MAAM,KAAK,GAAG,IAAI,OAAO,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,IAAA,0BAAQ,EAAC,UAAU,CAAC,MAAM,CAAC;gBAAE,MAAM,qBAAqB,IAAI,CAAC,IAAI,iEAAiE,CAAA;YACnN,IAAI,CAAC,MAAM;gBAAE,MAAM,YAAY,IAAI,CAAC,IAAI,8HAA8H,CAAC;YACvK,IAAI,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;gBAAE,MAAM,oBAAoB,IAAI,CAAC,IAAI,gDAAgD,GAAG,QAAQ,CAAC;SAC7I;QAED,MAAM,aAAa,GAAG,YAAY,IAAI,EAAE,CAAA;QACxC,MAAM,sBAAsB,GAAG,WAAW,EAAE,WAAW,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,aAAa,EAAE,CAAA;QACvK,MAAM,CAAC,GAAG,MAAM,IAAA,yBAAW,EACzB,IAA+B,EAC/B,MAAM,EACN,sBAAsB,EACtB,aAAa,EACb,UAAU,EACV,WAAW,CACZ,CAAC;QAEF,MAAM,eAAe,GAAG,IAAA,+BAAc,EACpC,IAAI,EACJ,CAAC,EACD,SAAS,EACT,CAAC,CAAC,sBAAsB,EAAE,OAAO,CAClC,CAAC;QAEF,MAAM,YAAY,GAAG,IAAA,wBAAW,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC/D,kDAAkD;QAClD,IAAI,QAAQ,EAAE;YACZ,IAAI;gBACF,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAA,wBAAW,EAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC;gBACvE,OAAO,EAAE,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,MAAM,2DAA2D,IAAI,CAAC,IAAI,UAAU,CAAA;aACrF;SACF;QAED,0BAA0B;QAC1B,IAAG,cAAc;YAAE,OAAQ,CAAoB,CAAC;QAChD,IAAI,WAAW,EAAE;YACf,OAAQ,CAAC,WAAW,KAAK,OAAO,CAAA,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY,CAAsB,CAAC;SACxF;QAED,OAAO,IAAA,0BAAkB,EAAC,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;KAExE;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,WAAW,IAAI,WAAW,CAAC,QAAQ;YAAE,MAAM,CAAC,CAAC;QACjD,MAAM,IAAA,uBAAU,EAAC,CAAC,EAAE,OAAO,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;KAChD;AACH,CAAC,CAAA;AAzEY,QAAA,IAAI,QAyEhB;AAGM,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAa,EAAE,UAAsC,EAAE,OAAmC,EAAE,WAAoC,EAAE,EAAE;IAE3K,IAAI,UAAU,KAAK,WAAW,EAAE;QAC9B,IAAI,CAAC,CAAC,MAAM,IAAA,kBAAS,EAAC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,EAAE;YACjE,MAAM,kEAAkE,CAAA;SACzE;QACD,OAAO,KAAyB,CAAC;KAElC;SAAM,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAW,CAAC,EAAE;QACjD,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC5D,OAAO,CAAC,IAAI,IAAI,UAAU,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1E,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,iCAAoB,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;KAC/D;SAAM;QACL,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACtD,IAAI,UAAU,KAAK,QAAQ,EAAE;gBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAA,iCAAoB,EAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;KAC/D;AACH,CAAC,CAAA;AApBY,QAAA,kBAAkB,sBAoB9B"}
|
|
@@ -85,7 +85,7 @@ export function getSelectQuery(
|
|
|
85
85
|
, ...getRootGroupBy(q, selectParamsGroupBy)
|
|
86
86
|
, ...prepareOrderByQuery(q.orderByItems)
|
|
87
87
|
, ...(q.having ? [`HAVING ${q.having} `] : [])
|
|
88
|
-
, ...(depth ? [] : [`LIMIT ${q.limit || 0}`])
|
|
88
|
+
, ...(depth || q.limit === null ? [] : [`LIMIT ${q.limit || 0}`])
|
|
89
89
|
, ...(q.offset? [`OFFSET ${q.offset || 0}`] : [])
|
|
90
90
|
];
|
|
91
91
|
|
|
@@ -185,7 +185,7 @@ export class ViewHandler {
|
|
|
185
185
|
if (!tableRules.select.fields) return throwFieldsErr("select");
|
|
186
186
|
|
|
187
187
|
let maxLimit: number | null = null;
|
|
188
|
-
if (tableRules.select.maxLimit !== undefined && tableRules.select.maxLimit !== maxLimit) {
|
|
188
|
+
if (!localParams?.bypassLimit && tableRules.select.maxLimit !== undefined && tableRules.select.maxLimit !== maxLimit) {
|
|
189
189
|
const ml = tableRules.select.maxLimit;
|
|
190
190
|
if (ml !== null && (!Number.isInteger(ml) || ml < 0)) throw ` Invalid publish.${this.name}.select.maxLimit -> expecting a positive integer OR null but got ` + ml;
|
|
191
191
|
maxLimit = ml;
|
|
@@ -401,25 +401,20 @@ export class ViewHandler {
|
|
|
401
401
|
prepareWhere = prepareWhere.bind(this);
|
|
402
402
|
|
|
403
403
|
/* This relates only to SELECT */
|
|
404
|
-
prepareLimitQuery(limit =
|
|
404
|
+
prepareLimitQuery(limit: number | null | undefined = null, p: ValidatedTableRules): number | null {
|
|
405
405
|
|
|
406
406
|
if (limit !== undefined && limit !== null && !Number.isInteger(limit)) {
|
|
407
407
|
throw "Unexpected LIMIT. Must be null or an integer";
|
|
408
408
|
}
|
|
409
409
|
|
|
410
410
|
let _limit = limit;
|
|
411
|
-
|
|
412
|
-
// if(_limit === undefined && p.select.maxLimit === null){
|
|
413
|
-
// _limit = 1000;
|
|
414
|
-
|
|
415
411
|
/* If no limit then set as the lesser of (100, maxLimit) */
|
|
416
|
-
// } else
|
|
417
412
|
if (_limit !== null && !Number.isInteger(_limit) && p.select.maxLimit !== null) {
|
|
418
413
|
_limit = [100, p.select.maxLimit].filter(Number.isInteger).sort((a, b) => a - b)[0]!;
|
|
419
414
|
} else {
|
|
420
415
|
|
|
421
416
|
/* If a limit higher than maxLimit specified throw error */
|
|
422
|
-
if (Number.isInteger(p.select.maxLimit) && _limit > p.select.maxLimit!) {
|
|
417
|
+
if (Number.isInteger(p.select.maxLimit) && _limit !== null && _limit > p.select.maxLimit!) {
|
|
423
418
|
throw `Unexpected LIMIT ${_limit}. Must be less than the published maxLimit: ` + p.select.maxLimit;
|
|
424
419
|
}
|
|
425
420
|
}
|
package/lib/DboBuilder/find.ts
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
|
|
2
2
|
import { SelectParams, isObject } from "prostgles-types";
|
|
3
3
|
import { Filter, LocalParams, makeErrorFromPGError, parseError, withUserRLS } from "../DboBuilder";
|
|
4
|
-
import { getSelectQuery } from "./QueryBuilder/getSelectQuery";
|
|
5
4
|
import { canRunSQL } from "../DboBuilder/runSQL";
|
|
6
5
|
import { TableRule } from "../PublishParser";
|
|
7
|
-
import { TableHandler } from "./TableHandler";
|
|
8
6
|
import { getNewQuery } from "./QueryBuilder/getNewQuery";
|
|
7
|
+
import { getSelectQuery } from "./QueryBuilder/getSelectQuery";
|
|
8
|
+
import { TableHandler } from "./TableHandler";
|
|
9
9
|
import { ViewHandler } from "./ViewHandler/ViewHandler";
|
|
10
|
-
import { omitKeys, pickKeys } from "../PubSubManager/PubSubManager";
|
|
11
10
|
|
|
12
11
|
export const find = async function(this: ViewHandler, filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams): Promise<any[]> {
|
|
13
12
|
try {
|
|
@@ -41,7 +40,7 @@ export const find = async function(this: ViewHandler, filter?: Filter, selectPar
|
|
|
41
40
|
}
|
|
42
41
|
|
|
43
42
|
const _selectParams = selectParams ?? {}
|
|
44
|
-
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit)?
|
|
43
|
+
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit)? { ..._selectParams, limit: null } : { limit: 1000, ..._selectParams }
|
|
45
44
|
const q = await getNewQuery(
|
|
46
45
|
this as unknown as TableHandler,
|
|
47
46
|
filter,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.80",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"check-disk-space": "^3.3.1",
|
|
42
42
|
"file-type": "^17.1.4",
|
|
43
43
|
"pg-promise": "^11.3.0",
|
|
44
|
-
"prostgles-types": "^4.0.
|
|
44
|
+
"prostgles-types": "^4.0.41"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/bluebird": "^3.5.36",
|
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
1241159
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"license": "ISC",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@types/node": "^14.14.16",
|
|
13
|
-
"prostgles-client": "^4.0.
|
|
13
|
+
"prostgles-client": "^4.0.25",
|
|
14
14
|
"socket.io-client": "^4.7.1"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
@@ -74,11 +74,11 @@
|
|
|
74
74
|
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
|
75
75
|
},
|
|
76
76
|
"node_modules/prostgles-client": {
|
|
77
|
-
"version": "4.0.
|
|
78
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.
|
|
79
|
-
"integrity": "sha512-
|
|
77
|
+
"version": "4.0.25",
|
|
78
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.25.tgz",
|
|
79
|
+
"integrity": "sha512-wXLrZB65uqF+lop8AV7AuiA01P2sIDZgj+VjH+/SMTlTv5LhpubORIXofDzlZfAwk2eUs53u6o707RtQ4qHt4w==",
|
|
80
80
|
"dependencies": {
|
|
81
|
-
"prostgles-types": "^4.0.
|
|
81
|
+
"prostgles-types": "^4.0.41"
|
|
82
82
|
},
|
|
83
83
|
"peerDependencies": {
|
|
84
84
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
|
|
@@ -90,9 +90,9 @@
|
|
|
90
90
|
}
|
|
91
91
|
},
|
|
92
92
|
"node_modules/prostgles-types": {
|
|
93
|
-
"version": "4.0.
|
|
94
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.
|
|
95
|
-
"integrity": "sha512-
|
|
93
|
+
"version": "4.0.41",
|
|
94
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.41.tgz",
|
|
95
|
+
"integrity": "sha512-DiSFE524LjCw5mc/2zDm9mnzirFCAPqutAJl/JD37t83uqXlOQjFb2cNvP4ACD444eJ0DXNhwm8Ko1gy7MsR6w==",
|
|
96
96
|
"dependencies": {
|
|
97
97
|
"json-schema": "^0.4.0"
|
|
98
98
|
}
|
|
@@ -212,17 +212,17 @@
|
|
|
212
212
|
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
|
213
213
|
},
|
|
214
214
|
"prostgles-client": {
|
|
215
|
-
"version": "4.0.
|
|
216
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.
|
|
217
|
-
"integrity": "sha512-
|
|
215
|
+
"version": "4.0.25",
|
|
216
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.25.tgz",
|
|
217
|
+
"integrity": "sha512-wXLrZB65uqF+lop8AV7AuiA01P2sIDZgj+VjH+/SMTlTv5LhpubORIXofDzlZfAwk2eUs53u6o707RtQ4qHt4w==",
|
|
218
218
|
"requires": {
|
|
219
|
-
"prostgles-types": "^4.0.
|
|
219
|
+
"prostgles-types": "^4.0.41"
|
|
220
220
|
}
|
|
221
221
|
},
|
|
222
222
|
"prostgles-types": {
|
|
223
|
-
"version": "4.0.
|
|
224
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.
|
|
225
|
-
"integrity": "sha512-
|
|
223
|
+
"version": "4.0.41",
|
|
224
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-4.0.41.tgz",
|
|
225
|
+
"integrity": "sha512-DiSFE524LjCw5mc/2zDm9mnzirFCAPqutAJl/JD37t83uqXlOQjFb2cNvP4ACD444eJ0DXNhwm8Ko1gy7MsR6w==",
|
|
226
226
|
"requires": {
|
|
227
227
|
"json-schema": "^0.4.0"
|
|
228
228
|
}
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"../..": {
|
|
23
23
|
"name": "prostgles-server",
|
|
24
|
-
"version": "4.1.
|
|
24
|
+
"version": "4.1.79",
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@types/express": "^4.17.13",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"check-disk-space": "^3.3.1",
|
|
31
31
|
"file-type": "^17.1.4",
|
|
32
32
|
"pg-promise": "^11.3.0",
|
|
33
|
-
"prostgles-types": "^4.0.
|
|
33
|
+
"prostgles-types": "^4.0.41"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/bluebird": "^3.5.36",
|
|
@@ -1521,7 +1521,7 @@
|
|
|
1521
1521
|
"eslint": "^8.44.0",
|
|
1522
1522
|
"file-type": "^17.1.4",
|
|
1523
1523
|
"pg-promise": "^11.3.0",
|
|
1524
|
-
"prostgles-types": "^4.0.
|
|
1524
|
+
"prostgles-types": "^4.0.41",
|
|
1525
1525
|
"typescript": "^5.0.3"
|
|
1526
1526
|
}
|
|
1527
1527
|
},
|