prostgles-server 4.2.549 → 4.2.550
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/TableHandler/TableHandler.d.ts +18 -5
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.js +12 -6
- package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/delete.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.js +56 -13
- package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
- package/dist/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.d.ts +21 -0
- package/dist/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.d.ts.map +1 -0
- package/dist/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.js +69 -0
- package/dist/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.js.map +1 -0
- package/dist/DboBuilder/TableHandler/insert/insert.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insert.js +21 -11
- package/dist/DboBuilder/TableHandler/insert/insert.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js +1 -2
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js +2 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +24 -95
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
- package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/update.js +20 -12
- package/dist/DboBuilder/TableHandler/update.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateBatch.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateBatch.js +13 -1
- package/dist/DboBuilder/TableHandler/updateBatch.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 +5 -5
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.js +20 -8
- package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts +0 -12
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js +27 -75
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getReturnTypeQuery.d.ts +14 -0
- package/dist/DboBuilder/ViewHandler/getReturnTypeQuery.d.ts.map +1 -0
- package/dist/DboBuilder/ViewHandler/getReturnTypeQuery.js +32 -0
- package/dist/DboBuilder/ViewHandler/getReturnTypeQuery.js.map +1 -0
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.js +23 -8
- package/dist/DboBuilder/ViewHandler/size.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +2 -2
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.js +1 -1
- package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts +34 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/TableConfig/TableConfig.d.ts +3 -15
- package/dist/TableConfig/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/dist/TableConfig/getCreateSchemaQueries.d.ts +4 -28
- package/dist/TableConfig/getCreateSchemaQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts +4 -28
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts.map +1 -1
- package/dist/utils/utils.d.ts +1 -0
- package/dist/utils/utils.d.ts.map +1 -1
- package/dist/utils/utils.js +3 -1
- package/dist/utils/utils.js.map +1 -1
- package/lib/DboBuilder/TableHandler/TableHandler.ts +21 -6
- package/lib/DboBuilder/TableHandler/delete.ts +83 -15
- package/lib/DboBuilder/TableHandler/executeHooksCheckAndPostValidation.ts +88 -0
- package/lib/DboBuilder/TableHandler/insert/insert.ts +25 -11
- package/lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts +1 -2
- package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +7 -5
- package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +34 -110
- package/lib/DboBuilder/TableHandler/update.ts +21 -12
- package/lib/DboBuilder/TableHandler/updateBatch.ts +15 -2
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +5 -5
- package/lib/DboBuilder/ViewHandler/count.ts +24 -9
- package/lib/DboBuilder/ViewHandler/find.ts +35 -96
- package/lib/DboBuilder/ViewHandler/getReturnTypeQuery.ts +50 -0
- package/lib/DboBuilder/ViewHandler/size.ts +26 -12
- package/lib/DboBuilder/dboBuilderUtils.ts +1 -1
- package/lib/DboBuilder/parseUpdateRules.ts +1 -1
- package/lib/PublishParser/publishTypesAndUtils.ts +42 -1
- package/lib/TableConfig/TableConfig.ts +4 -18
- package/lib/utils/utils.ts +2 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onDeleteFromFileTable.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"onDeleteFromFileTable.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":";;AAeA,sDAsDC;AApED,qDAAmD;AAc5C,KAAK,UAAU,qBAAqB,CAEzC,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAA6B;IAEjF,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAC9B,UAAU,IAAA,wBAAM,EAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,UAAU,CAAC,KAAK,IAAI,cAAc,IAAI,EAAE,GAAG,CAC/F,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAiB,EAAE,EAAE;YAC3C,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC9D,IAAI,KAAK,GAAmC,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACtD,GAAG,CAAC;gBACF,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;oBAC/C,KAAK,EAAE,GAAG;oBACV,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC,CAAsB,CAAC;gBACzB,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;YAC/B,CAAC,QAAQ,KAAK,CAAC,MAAM,GAAG,UAAU,EAAE;YAEpC,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC;YACzD,IAAI,CAAC,WAAW;gBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAEzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,IAAA,wBAAM,EAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;YACjF,CAAC;YACD,yDAAyD;YACzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,2DAA2D;gBAC3D,kIAAkI;YACpI,CAAC;YAED,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAQ,EAAC,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;YACvD,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC;QAEF,IAAI,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;gBAClC,OAAO,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runInsertUpdateQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE1F,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"runInsertUpdateQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE1F,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAInD,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,YAAY,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,eAAe,EAAE,WAAW,GAAG,SAAS,CAAC;CAC1C,GAAG,CACA;IACE,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,CAAC,EAAE,SAAS,CAAC;CACrC,GACD;IACE,OAAO,EAAE,QAAQ,CAAC;IAClB,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,CACJ,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,wBAAwB;;;;gBA6HxE,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.runInsertUpdateQuery = void 0;
|
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const DboBuilder_1 = require("../DboBuilder");
|
|
6
6
|
const TableHandler_1 = require("./TableHandler");
|
|
7
|
+
const executeHooksCheckAndPostValidation_1 = require("./executeHooksCheckAndPostValidation");
|
|
7
8
|
const runInsertUpdateQuery = async (args) => {
|
|
8
9
|
const { tableHandler, queryWithoutUserRLS, rule, localParams, fields, returningFields, params, nestedInsertsResultsObj, data, command, } = args;
|
|
9
10
|
const { name } = tableHandler;
|
|
@@ -30,7 +31,12 @@ const runInsertUpdateQuery = async (args) => {
|
|
|
30
31
|
RETURNING *
|
|
31
32
|
)
|
|
32
33
|
SELECT
|
|
33
|
-
count(*) as row_count,
|
|
34
|
+
count(*) as row_count,
|
|
35
|
+
EXISTS (
|
|
36
|
+
SELECT *
|
|
37
|
+
FROM ${escapedTableName}
|
|
38
|
+
${checkCondition}
|
|
39
|
+
) AS failed_check,
|
|
34
40
|
(
|
|
35
41
|
SELECT json_agg(item)
|
|
36
42
|
FROM (
|
|
@@ -45,107 +51,31 @@ const runInsertUpdateQuery = async (args) => {
|
|
|
45
51
|
FROM ${escapedTableName}
|
|
46
52
|
WHERE ${hasReturning ? "TRUE" : "FALSE"}
|
|
47
53
|
) item
|
|
48
|
-
) as modified_returning
|
|
49
|
-
(
|
|
50
|
-
SELECT json_agg(item)
|
|
51
|
-
FROM (
|
|
52
|
-
SELECT *
|
|
53
|
-
FROM ${escapedTableName}
|
|
54
|
-
${checkCondition}
|
|
55
|
-
LIMIT 5
|
|
56
|
-
) item
|
|
57
|
-
) AS failed_check
|
|
54
|
+
) as modified_returning
|
|
58
55
|
FROM ${escapedTableName}
|
|
59
56
|
`;
|
|
60
57
|
const allowedFieldKeys = tableHandler.parseFieldFilter(fields);
|
|
61
|
-
let result;
|
|
62
58
|
const queryType = "one";
|
|
63
|
-
const tx =
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
else {
|
|
74
|
-
result = await tableHandler.db
|
|
75
|
-
.tx((t) => t[queryType](query))
|
|
76
|
-
.catch((err) => (0, DboBuilder_1.getClientErrorFromPGError)(err, {
|
|
77
|
-
type: "tableMethod",
|
|
78
|
-
localParams,
|
|
79
|
-
view: tableHandler,
|
|
80
|
-
allowedKeys: allowedFieldKeys,
|
|
81
|
-
prostgles: tableHandler.dboBuilder.prostgles,
|
|
82
|
-
}));
|
|
83
|
-
}
|
|
84
|
-
if (checkFilter && result.failed_check?.length) {
|
|
59
|
+
const tx = tableHandler.getTransaction(localParams)?.t;
|
|
60
|
+
const queryPromise = tx ? tx[queryType](query) : tableHandler.db.tx((t) => t[queryType](query));
|
|
61
|
+
const result = await queryPromise.catch((err) => (0, DboBuilder_1.rejectWithPGClientError)(err, {
|
|
62
|
+
type: "tableMethod",
|
|
63
|
+
localParams,
|
|
64
|
+
view: tableHandler,
|
|
65
|
+
allowedKeys: allowedFieldKeys,
|
|
66
|
+
prostgles: tableHandler.dboBuilder.prostgles,
|
|
67
|
+
}));
|
|
68
|
+
if (checkFilter && result.failed_check) {
|
|
85
69
|
throw new Error(`Insert ${name} records failed the check condition: ${JSON.stringify(checkFilter, null, 2)}`);
|
|
86
70
|
}
|
|
87
71
|
const rows = result.modified ?? [];
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
return changedFieldsSet;
|
|
95
|
-
};
|
|
96
|
-
const applicableHooks = hooks.filter((hook) => {
|
|
97
|
-
if (hook.type === "checkFilter")
|
|
98
|
-
return;
|
|
99
|
-
if (hook.type === "postValidate")
|
|
100
|
-
return true;
|
|
101
|
-
const { commands, changedFields } = hook;
|
|
102
|
-
return (commands[command] &&
|
|
103
|
-
(!changedFields || changedFields.some((f) => getChangedFieldsSet().has(f))));
|
|
72
|
+
await (0, executeHooksCheckAndPostValidation_1.executeHooksCheckAndPostValidation)({
|
|
73
|
+
tableHandler,
|
|
74
|
+
operation: command === "insert" ? { name: "insert", rule } : { name: "update", rule },
|
|
75
|
+
localParams,
|
|
76
|
+
rows,
|
|
77
|
+
data,
|
|
104
78
|
});
|
|
105
|
-
if (postValidate && !localParams) {
|
|
106
|
-
throw new Error("Unexpected: no localParams for postValidate");
|
|
107
|
-
}
|
|
108
|
-
if (applicableHooks.length) {
|
|
109
|
-
if (!finalDBtx)
|
|
110
|
-
throw new Error("Unexpected: no dbTX for hooks/postValidate");
|
|
111
|
-
for (const row of rows) {
|
|
112
|
-
const commonParams = {
|
|
113
|
-
row: row,
|
|
114
|
-
tx: tx || tableHandler.db,
|
|
115
|
-
dbx: finalDBtx,
|
|
116
|
-
command,
|
|
117
|
-
data,
|
|
118
|
-
};
|
|
119
|
-
for (const hook of applicableHooks) {
|
|
120
|
-
if (hook.type === "afterEach") {
|
|
121
|
-
await hook.validate({
|
|
122
|
-
...commonParams,
|
|
123
|
-
localParams,
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
else if (hook.type === "postValidate") {
|
|
127
|
-
if (!localParams)
|
|
128
|
-
throw new Error("Unexpected: no localParams for postValidate");
|
|
129
|
-
await hook.validate({
|
|
130
|
-
...commonParams,
|
|
131
|
-
localParams,
|
|
132
|
-
});
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
for (const hook of applicableHooks) {
|
|
137
|
-
if (hook.type === "afterAll") {
|
|
138
|
-
await hook.validate({
|
|
139
|
-
tx: tx || tableHandler.db,
|
|
140
|
-
dbx: finalDBtx,
|
|
141
|
-
command,
|
|
142
|
-
data: Array.isArray(data) ? data : [data],
|
|
143
|
-
rows,
|
|
144
|
-
localParams,
|
|
145
|
-
});
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
79
|
let returnMany = false;
|
|
150
80
|
if (args.command === "update") {
|
|
151
81
|
const { multi = true } = args.params || {};
|
|
@@ -168,5 +98,4 @@ const runInsertUpdateQuery = async (args) => {
|
|
|
168
98
|
return returnMany ? modified_returning : modified_returning?.[0];
|
|
169
99
|
};
|
|
170
100
|
exports.runInsertUpdateQuery = runInsertUpdateQuery;
|
|
171
|
-
const isArray = (data) => Array.isArray(data);
|
|
172
101
|
//# sourceMappingURL=runInsertUpdateQuery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":";;;AACA,qDAAyC;AAGzC,
|
|
1
|
+
{"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAKnD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAsM3B"}
|
|
@@ -7,15 +7,15 @@ const getReferenceColumnInserts_1 = require("./insert/getReferenceColumnInserts"
|
|
|
7
7
|
const runInsertUpdateQuery_1 = require("./runInsertUpdateQuery");
|
|
8
8
|
const updateFile_1 = require("./updateFile");
|
|
9
9
|
const getInsertTableRules_1 = require("./insert/getInsertTableRules");
|
|
10
|
+
const getReturnTypeQuery_1 = require("../ViewHandler/getReturnTypeQuery");
|
|
10
11
|
async function update(filter, _newData, params, tableRules, localParams) {
|
|
11
12
|
const ACTION = "update";
|
|
12
13
|
const start = Date.now();
|
|
13
14
|
try {
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
const wrapInTx = () => this.dboBuilder.getTX((_dbtx) => _dbtx[this.name]?.[ACTION]?.(filter, _newData, params, tableRules, localParams));
|
|
15
|
+
const transaction = this.getTransaction(localParams);
|
|
16
|
+
const wrapInTx = () => this.dboBuilder.getTX((th) => th[this.name]?.[ACTION]?.(filter, _newData, params, tableRules, localParams));
|
|
17
17
|
const rule = tableRules?.[ACTION];
|
|
18
|
-
if (this.shouldWrapInTx({ name: ACTION, rule }, localParams)) {
|
|
18
|
+
if (this.shouldWrapInTx({ name: ACTION, rule }, localParams).shouldWrap) {
|
|
19
19
|
return wrapInTx();
|
|
20
20
|
}
|
|
21
21
|
let newData = _newData;
|
|
@@ -37,7 +37,6 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
37
37
|
}
|
|
38
38
|
const { fields, validateRow, forcedData, returningFields, forcedFilter, filterFields } = parsedRules;
|
|
39
39
|
const { removeDisallowedFields = false } = params || {};
|
|
40
|
-
const { returnQuery = false } = localParams ?? {};
|
|
41
40
|
if (params) {
|
|
42
41
|
const good_paramsObj = {
|
|
43
42
|
returning: 1,
|
|
@@ -78,13 +77,13 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
78
77
|
if (+updateCount > 1) {
|
|
79
78
|
throw "Cannot do a nestedInsert from an update that targets more than 1 row";
|
|
80
79
|
}
|
|
81
|
-
if (!
|
|
80
|
+
if (!transaction) {
|
|
82
81
|
return wrapInTx();
|
|
83
82
|
}
|
|
84
83
|
await Promise.all(nestedInserts.map(async (nestedInsert) => {
|
|
85
|
-
const
|
|
86
|
-
if (!
|
|
87
|
-
throw `nestedInsert
|
|
84
|
+
const nestedTableHandler = transaction.dbTX[nestedInsert.tableName];
|
|
85
|
+
if (!nestedTableHandler)
|
|
86
|
+
throw `nestedInsert TableHandler not found for ${nestedInsert.tableName}`;
|
|
88
87
|
const refTableRules = !localParams ? undefined : (await (0, getInsertTableRules_1.getInsertTableRules)(this, nestedInsert.tableName, localParams.clientReq, localParams.scope));
|
|
89
88
|
const nestedLocalParams = {
|
|
90
89
|
...localParams,
|
|
@@ -95,7 +94,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
95
94
|
referencingColumn: nestedInsert.insertedFieldName,
|
|
96
95
|
},
|
|
97
96
|
};
|
|
98
|
-
const nestedInsertResult = (await
|
|
97
|
+
const nestedInsertResult = (await nestedTableHandler.insert(nestedInsert.data, { returning: "*" }, undefined, refTableRules, nestedLocalParams));
|
|
99
98
|
nestedInsertsResultsObj[nestedInsert.insertedFieldName] = nestedInsertResult;
|
|
100
99
|
nestedInsert.insertedFieldRef.fcols.forEach((fcol, idx) => {
|
|
101
100
|
const col = nestedInsert.insertedFieldRef.cols[idx];
|
|
@@ -121,8 +120,17 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
121
120
|
query += "\n" + updateFilter.where;
|
|
122
121
|
const queryWithoutUserRLS = query;
|
|
123
122
|
query = (0, DboBuilder_1.withUserRLS)(localParams, query);
|
|
124
|
-
|
|
125
|
-
|
|
123
|
+
const queryToReturn = await (0, getReturnTypeQuery_1.getReturnTypeQuery)({
|
|
124
|
+
handler: this,
|
|
125
|
+
localParams,
|
|
126
|
+
queryWithoutRLS: queryWithoutUserRLS,
|
|
127
|
+
queryWithRLS: query,
|
|
128
|
+
returnType: params?.returnType,
|
|
129
|
+
newQuery: undefined,
|
|
130
|
+
});
|
|
131
|
+
if (queryToReturn) {
|
|
132
|
+
return queryToReturn;
|
|
133
|
+
}
|
|
126
134
|
const result = await (0, runInsertUpdateQuery_1.runInsertUpdateQuery)({
|
|
127
135
|
tableHandler: this,
|
|
128
136
|
data: nData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateBatch.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateBatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAOzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"updateBatch.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateBatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAOzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGnD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAC9B,MAAM,CAAC,EAAE,YAAY,EACrB,CAAC,CAAC,EAAE,SAAS,EACb,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC,CAiFd"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateBatch = updateBatch;
|
|
4
4
|
const DboBuilder_1 = require("../DboBuilder");
|
|
5
|
+
const getReturnTypeQuery_1 = require("../ViewHandler/getReturnTypeQuery");
|
|
5
6
|
async function updateBatch(updates, params, _, tableRules, localParams) {
|
|
6
7
|
const start = Date.now();
|
|
7
8
|
try {
|
|
@@ -14,6 +15,17 @@ async function updateBatch(updates, params, _, tableRules, localParams) {
|
|
|
14
15
|
return query;
|
|
15
16
|
}));
|
|
16
17
|
const queries = [(0, DboBuilder_1.withUserRLS)(localParams, ""), ...updateQueries];
|
|
18
|
+
const queryToReturn = await (0, getReturnTypeQuery_1.getReturnTypeQuery)({
|
|
19
|
+
handler: this,
|
|
20
|
+
localParams,
|
|
21
|
+
queryWithoutRLS: queries.slice(1).join(";\n"),
|
|
22
|
+
queryWithRLS: queries.join(";\n"),
|
|
23
|
+
returnType: params?.returnType,
|
|
24
|
+
newQuery: undefined,
|
|
25
|
+
});
|
|
26
|
+
if (queryToReturn) {
|
|
27
|
+
return queryToReturn;
|
|
28
|
+
}
|
|
17
29
|
const t = localParams?.tx?.t ?? this.tx?.t;
|
|
18
30
|
if (t) {
|
|
19
31
|
const result = await t.none(queries.join(";\n"));
|
|
@@ -29,7 +41,7 @@ async function updateBatch(updates, params, _, tableRules, localParams) {
|
|
|
29
41
|
.tx((t) => {
|
|
30
42
|
return t.none(queries.join(";\n"));
|
|
31
43
|
})
|
|
32
|
-
.catch((err) => (0, DboBuilder_1.
|
|
44
|
+
.catch((err) => (0, DboBuilder_1.rejectWithPGClientError)(err, {
|
|
33
45
|
type: "tableMethod",
|
|
34
46
|
localParams,
|
|
35
47
|
view: this,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateBatch.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateBatch.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"updateBatch.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateBatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ export declare class ViewHandler {
|
|
|
86
86
|
filter: AnyObject;
|
|
87
87
|
exists: import("../DboBuilderTypes").ExistsFilterConfig[];
|
|
88
88
|
}>;
|
|
89
|
-
intersectColumns(allowedFields: FieldFilter,
|
|
89
|
+
intersectColumns(allowedFields: FieldFilter, disallowedFields: FieldFilter, removeDisallowedFields?: boolean): string[];
|
|
90
90
|
parseFieldFilter(fieldParams?: FieldFilter, allow_empty?: boolean, allowed_cols?: string[]): string[];
|
|
91
91
|
}
|
|
92
92
|
/**
|
|
@@ -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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"}
|
|
@@ -159,17 +159,17 @@ class ViewHandler {
|
|
|
159
159
|
* Parses group or simple filter
|
|
160
160
|
*/
|
|
161
161
|
prepareWhere = prepareWhere_1.prepareWhere.bind(this);
|
|
162
|
-
intersectColumns(allowedFields,
|
|
162
|
+
intersectColumns(allowedFields, disallowedFields, removeDisallowedFields = false) {
|
|
163
163
|
let result = [];
|
|
164
164
|
if (allowedFields) {
|
|
165
165
|
result = this.parseFieldFilter(allowedFields);
|
|
166
166
|
}
|
|
167
|
-
if (
|
|
168
|
-
const
|
|
167
|
+
if (disallowedFields) {
|
|
168
|
+
const excludedFields = this.parseFieldFilter(disallowedFields);
|
|
169
169
|
if (!removeDisallowedFields) {
|
|
170
|
-
throw `
|
|
170
|
+
throw `disallowed/invalid field found for ${this.name}: `;
|
|
171
171
|
}
|
|
172
|
-
result = result.filter((key) => !
|
|
172
|
+
result = result.filter((key) => !excludedFields.includes(key));
|
|
173
173
|
}
|
|
174
174
|
return result;
|
|
175
175
|
}
|
|
@@ -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":"count.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,YAAY,EAC3B,cAAc,CAAC,EAAE,SAAS,EAC1B,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,CAgEjB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.count = count;
|
|
4
4
|
const dboBuilderUtils_1 = require("../dboBuilderUtils");
|
|
5
|
+
const getReturnTypeQuery_1 = require("./getReturnTypeQuery");
|
|
5
6
|
async function count(_filter, selectParams, _param3_unused, table_rules, localParams) {
|
|
6
7
|
const filter = _filter || {};
|
|
7
8
|
const { limit: _limit, ...selectParamsWithoutLimit } = selectParams ?? {};
|
|
@@ -13,15 +14,26 @@ async function count(_filter, selectParams, _param3_unused, table_rules, localPa
|
|
|
13
14
|
returnQuery: "noRLS",
|
|
14
15
|
bypassLimit: true,
|
|
15
16
|
}));
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
17
|
+
const queryWithoutUserRLS = `
|
|
18
|
+
SELECT COUNT(*)
|
|
19
|
+
FROM (
|
|
20
|
+
${findQuery}
|
|
21
|
+
) t
|
|
22
|
+
`;
|
|
23
|
+
const queryWithRLS = (0, dboBuilderUtils_1.withUserRLS)(localParams, queryWithoutUserRLS);
|
|
24
|
+
const queryToReturn = await (0, getReturnTypeQuery_1.getReturnTypeQuery)({
|
|
25
|
+
handler: this,
|
|
26
|
+
localParams,
|
|
27
|
+
queryWithoutRLS: queryWithoutUserRLS,
|
|
28
|
+
queryWithRLS,
|
|
29
|
+
returnType: selectParams?.returnType,
|
|
30
|
+
newQuery: undefined,
|
|
31
|
+
});
|
|
32
|
+
if (queryToReturn) {
|
|
33
|
+
return queryToReturn;
|
|
34
|
+
}
|
|
23
35
|
const handler = this.tx?.t ?? this.db;
|
|
24
|
-
return handler.one(
|
|
36
|
+
return handler.one(queryWithRLS).then(({ count }) => +count);
|
|
25
37
|
});
|
|
26
38
|
await this._log({
|
|
27
39
|
command: "count",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;AAWA,sBAuEC;AA/ED,wDAI4B;AAE5B,6DAA0D;AAEnD,KAAK,UAAU,KAAK,CAEzB,OAAgB,EAChB,YAA2B,EAC3B,cAA0B,EAC1B,WAA6B,EAC7B,WAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,IAAI,EAAE,CAAC;IAC7B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,MAAM,EACN,EAAE,MAAM,EAAE,wBAAwB,CAAC,MAAM,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAC3D,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACxB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,wBAAwB,EAAE,SAAS,EAAE,WAAW,EAAE;gBAC3F,GAAG,WAAW;gBACd,WAAW,EAAE,OAAO;gBACpB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAsB,CAAC;YAEzB,MAAM,mBAAmB,GAAG;;;UAGxB,SAAS;;OAEZ,CAAC;YACF,MAAM,YAAY,GAAG,IAAA,6BAAW,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;YAEnE,MAAM,aAAa,GAAG,MAAM,IAAA,uCAAkB,EAAC;gBAC7C,OAAO,EAAE,IAAI;gBACb,WAAW;gBACX,eAAe,EAAE,mBAAmB;gBACpC,YAAY;gBACZ,UAAU,EAAE,YAAY,EAAE,UAAU;gBACpC,QAAQ,EAAE,SAAS;aACpB,CAAC,CAAC;YACH,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,aAA0B,CAAC;YACpC,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,OAAO;YAChB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;SAC7B,CAAC,CAAC;QACH,OAAO,MAAgB,CAAC;IAC1B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,OAAO;YAChB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAC5B,KAAK,EAAE,IAAA,kCAAgB,EAAC,CAAC,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,IAAA,qDAAmC,EAAC,CAAC,EAAE;YAC3C,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;SACrC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,18 +1,6 @@
|
|
|
1
1
|
import type { SelectParams } from "prostgles-types";
|
|
2
2
|
import type { ParsedTableRule } from "../../PublishParser/PublishParser";
|
|
3
3
|
import type { Filter, LocalParams } from "../DboBuilder";
|
|
4
|
-
import type { NewQuery } from "../QueryBuilder/QueryBuilder";
|
|
5
|
-
import type { TableHandler } from "../TableHandler/TableHandler";
|
|
6
4
|
import type { ViewHandler } from "./ViewHandler";
|
|
7
5
|
export declare const find: (this: ViewHandler, filter?: Filter, selectParams?: SelectParams, _?: undefined, tableRules?: ParsedTableRule, localParams?: LocalParams) => Promise<any[]>;
|
|
8
|
-
type RunQueryReturnTypeArgs = {
|
|
9
|
-
queryWithRLS: string;
|
|
10
|
-
queryWithoutRLS: string;
|
|
11
|
-
returnType: SelectParams["returnType"];
|
|
12
|
-
handler: ViewHandler | TableHandler;
|
|
13
|
-
localParams: LocalParams | undefined;
|
|
14
|
-
newQuery: NewQuery | undefined;
|
|
15
|
-
};
|
|
16
|
-
export declare const runQueryReturnType: ({ newQuery, handler, localParams, queryWithRLS, queryWithoutRLS, returnType, }: RunQueryReturnTypeArgs) => Promise<any>;
|
|
17
|
-
export {};
|
|
18
6
|
//# sourceMappingURL=find.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,IAAI,GACf,MAAM,WAAW,EACjB,SAAS,MAAM,EACf,eAAe,YAAY,EAC3B,IAAI,SAAS,EACb,aAAa,eAAe,EAC5B,cAAc,WAAW,KACxB,OAAO,CAAC,GAAG,EAAE,CAoJf,CAAC"}
|