prostgles-server 4.2.576 → 4.2.577

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.
Files changed (41) hide show
  1. package/dist/DboBuilder/DboBuilder.d.ts +1 -1
  2. package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +1 -1
  3. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts +1 -2
  4. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
  5. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js +2 -2
  6. package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
  7. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
  8. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +58 -40
  9. package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
  10. package/dist/DboBuilder/TableHandler/updateFile.d.ts +4 -7
  11. package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
  12. package/dist/DboBuilder/TableHandler/updateFile.js +7 -6
  13. package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
  14. package/dist/DboBuilder/TableHandler/uploadFile.d.ts +31 -0
  15. package/dist/DboBuilder/TableHandler/uploadFile.d.ts.map +1 -0
  16. package/dist/DboBuilder/{uploadFile.js → TableHandler/uploadFile.js} +26 -14
  17. package/dist/DboBuilder/TableHandler/uploadFile.js.map +1 -0
  18. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +1 -0
  19. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
  20. package/dist/DboBuilder/ViewHandler/ViewHandler.js +2 -0
  21. package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
  22. package/dist/DboBuilder/runSql/runSqlUtils.d.ts +1 -1
  23. package/dist/StorageClient/getFileTableConfig.d.ts +12 -10
  24. package/dist/StorageClient/getFileTableConfig.d.ts.map +1 -1
  25. package/dist/StorageClient/getFileTableConfig.js +17 -13
  26. package/dist/StorageClient/getFileTableConfig.js.map +1 -1
  27. package/dist/StorageClient/setupFileServeHandler.d.ts.map +1 -1
  28. package/dist/StorageClient/setupFileServeHandler.js +5 -7
  29. package/dist/StorageClient/setupFileServeHandler.js.map +1 -1
  30. package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +1 -1
  31. package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +3 -3
  32. package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +72 -47
  33. package/lib/DboBuilder/TableHandler/updateFile.ts +12 -10
  34. package/lib/DboBuilder/{uploadFile.ts → TableHandler/uploadFile.ts} +43 -22
  35. package/lib/DboBuilder/ViewHandler/ViewHandler.ts +2 -0
  36. package/lib/StorageClient/getFileTableConfig.ts +26 -13
  37. package/lib/StorageClient/setupFileServeHandler.ts +6 -7
  38. package/package.json +2 -2
  39. package/dist/DboBuilder/uploadFile.d.ts +0 -26
  40. package/dist/DboBuilder/uploadFile.d.ts.map +0 -1
  41. package/dist/DboBuilder/uploadFile.js.map +0 -1
@@ -40,7 +40,7 @@ export declare class DboBuilder {
40
40
  private init;
41
41
  get tables(): TableSchema[];
42
42
  getDetailedFieldInfo: (fields: pg.IColumn[]) => Promise<{
43
- tsDataType: "string" | "number" | "boolean" | "any" | "string[]" | "number[]" | "boolean[]" | "any[]" | "ArrayBuffer";
43
+ tsDataType: "string" | "number" | "boolean" | "any" | "string[]" | "number[]" | "boolean[]" | "any[]" | "ArrayBuffer | Uint8Array";
44
44
  dataType: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
45
45
  udt_name: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
46
46
  tableName: string | undefined;
@@ -203,7 +203,7 @@ class SelectItemBuilder {
203
203
  }
204
204
  else {
205
205
  if (!joinParse) {
206
- throw "Joins dissalowed";
206
+ throw "Joins disallowed";
207
207
  }
208
208
  await joinParse(key, val, throwErr);
209
209
  }
@@ -14,7 +14,6 @@ type OnDeleteFromFileTableArgs = {
14
14
  };
15
15
  export declare const onDeleteFromFileTable: (config: FileTableConfig, { dbTX, t, returningQuery, filterOpts, isOneOrNone }: OnDeleteFromFileTableArgs) => Promise<AnyObject[] | Pick<{
16
16
  id: string;
17
- name: string;
18
- }, "id" | "name">[] | undefined>;
17
+ }, "id">[] | undefined>;
19
18
  export {};
20
19
  //# sourceMappingURL=onDeleteFromFileTable.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"onDeleteFromFileTable.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,KAAK,yBAAyB,GAAG;IAC/B,cAAc,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;KACnB,CAAC;IACF,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,eAAO,MAAM,qBAAqB,GAChC,QAAQ,eAAe,EACvB,sDAAsD,yBAAyB;QAc9D,MAAM;UAAQ,MAAM;gCAuBtC,CAAC"}
1
+ {"version":3,"file":"onDeleteFromFileTable.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,KAAK,yBAAyB,GAAG;IAC/B,cAAc,EAAE,SAAS,GAAG,MAAM,CAAC;IACnC,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,SAAS,CAAC;KACnB,CAAC;IACF,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,eAAO,MAAM,qBAAqB,GAChC,QAAQ,eAAe,EACvB,sDAAsD,yBAAyB;QAc9D,MAAM;uBAuBxB,CAAC"}
@@ -26,10 +26,10 @@ const onDeleteFromFileTable = async (config, { dbTX, t, returningQuery, filterOp
26
26
  }
27
27
  /** If any table delete fails then do not delete files */
28
28
  for (const file of files) {
29
- await storageClient.delete(file.name);
29
+ await storageClient.delete(file.id);
30
30
  }
31
31
  if (returningQuery) {
32
- return files.map((f) => (0, prostgles_types_1.pickKeys)(f, ["id", "name"]));
32
+ return files.map((f) => (0, prostgles_types_1.pickKeys)(f, ["id"]));
33
33
  }
34
34
  return undefined;
35
35
  };
@@ -1 +1 @@
1
- {"version":3,"file":"onDeleteFromFileTable.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":";;;AAEA,qDAAmD;AAe5C,MAAM,qBAAqB,GAAG,KAAK,EACxC,MAAuB,EACvB,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAA6B,EAC/E,EAAE;IACF,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,oBAAoB,SAAS,oBAAoB,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CACxB,UAAU,IAAA,wBAAM,EAAC,SAAS,CAAC,wBAAwB,UAAU,CAAC,KAAK,IAAI,cAAc,IAAI,EAAE,GAAG,CAC/F,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAA4B,CAAC;IACvE,CAAC;IAED,IAAI,KAAK,GAAmC,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/D,GAAG,CAAC;QACF,MAAM,KAAK,GAAG,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACxD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC,CAAmB,CAAC;QACtB,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;IAC/B,CAAC,QAAQ,KAAK,CAAC,MAAM,GAAG,UAAU,EAAE;IAEpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,IAAA,wBAAM,EAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IACD,yDAAyD;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAQ,EAAC,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAvCW,QAAA,qBAAqB,yBAuChC"}
1
+ {"version":3,"file":"onDeleteFromFileTable.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts"],"names":[],"mappings":";;;AAEA,qDAAmD;AAe5C,MAAM,qBAAqB,GAAG,KAAK,EACxC,MAAuB,EACvB,EAAE,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAA6B,EAC/E,EAAE;IACF,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,oBAAoB,SAAS,oBAAoB,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CACxB,UAAU,IAAA,wBAAM,EAAC,SAAS,CAAC,wBAAwB,UAAU,CAAC,KAAK,IAAI,cAAc,IAAI,EAAE,GAAG,CAC/F,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAA4B,CAAC;IACvE,CAAC;IAED,IAAI,KAAK,GAAqB,EAAE,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/D,GAAG,CAAC;QACF,MAAM,KAAK,GAAG,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACxD,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC,CAAmB,CAAC;QACtB,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;IAC/B,CAAC,QAAQ,KAAK,CAAC,MAAM,GAAG,UAAU,EAAE;IAEpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,CAAC,GAAG,CAAC,eAAe,IAAA,wBAAM,EAAC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IACD,yDAAyD;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAQ,EAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAvCW,QAAA,qBAAqB,yBAuChC"}
@@ -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;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,SAAS,CAAC;CACjB,CACJ,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,wBAAwB;;;;gBA6HxE,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,SAAS,CAAC;CACjB,CACJ,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,wBAAwB;;;;gBAsJxE,CAAC"}
@@ -10,7 +10,8 @@ const runInsertUpdateQuery = async (args) => {
10
10
  const { name } = tableHandler;
11
11
  const returningSelectItems = await tableHandler.prepareReturning(params?.returning, tableHandler.parseFieldFilter(returningFields));
12
12
  const { checkFilter } = rule ?? {};
13
- let checkCondition = "WHERE FALSE";
13
+ // let checkCondition = "WHERE FALSE";
14
+ let checkCondition = "FALSE";
14
15
  if (checkFilter) {
15
16
  const checkCond = await tableHandler.prepareWhere({
16
17
  select: undefined,
@@ -19,43 +20,45 @@ const runInsertUpdateQuery = async (args) => {
19
20
  filter: checkFilter,
20
21
  addWhere: false,
21
22
  });
22
- checkCondition = `WHERE NOT (${checkCond.where})`;
23
+ // checkCondition = `WHERE NOT (${checkCond.where})`;
24
+ checkCondition = `NOT (${checkCond.where})`;
23
25
  }
24
26
  const hasReturning = !!returningSelectItems.length;
25
27
  const userRLS = (0, DboBuilder_1.withUserRLS)(localParams, "");
26
- const escapedTableName = (0, prostgles_types_1.asName)(name);
28
+ const CHECK_CONDITION_ALIAS = "prostgles_check_condition";
29
+ const RETURNING_ALIAS_PREFIX = "prostgles_returning_";
30
+ const returningSelectKeyRemap = new Map();
27
31
  const query = `
28
- ${userRLS}
29
- WITH ${escapedTableName} AS (
30
- ${queryWithoutUserRLS}
31
- RETURNING *
32
- )
33
- SELECT
34
- count(*) as row_count,
35
- EXISTS (
36
- SELECT *
37
- FROM ${escapedTableName}
38
- ${checkCondition}
39
- ) AS failed_check,
40
- (
41
- SELECT json_agg(item)
42
- FROM (
43
- SELECT *
44
- FROM ${escapedTableName}
45
- ) item
46
- ) as modified,
47
- (
48
- SELECT json_agg(item)
49
- FROM (
50
- SELECT ${!hasReturning ? "1" : (0, TableHandler_1.getSelectItemQuery)(returningSelectItems)}
51
- FROM ${escapedTableName}
52
- WHERE ${hasReturning ? "TRUE" : "FALSE"}
53
- ) item
54
- ) as modified_returning
55
- FROM ${escapedTableName}
32
+ ${userRLS}
33
+ ${queryWithoutUserRLS}
34
+ RETURNING ${[
35
+ "*",
36
+ (0, TableHandler_1.getSelectItemQuery)(returningSelectItems
37
+ .map((item, index) => {
38
+ /** Skip if exists in 'returning *' */
39
+ if (item.type === "column" && (0, prostgles_types_1.asName)(item.alias) === item.getQuery()) {
40
+ if (!tableHandler.columnSet.has(item.alias)) {
41
+ throw new Error(`Returning column ${item.alias} does not exist in table ${name}`);
42
+ }
43
+ returningSelectKeyRemap.set(item.alias, item.alias);
44
+ return;
45
+ }
46
+ const newAlias = RETURNING_ALIAS_PREFIX + index;
47
+ if (tableHandler.columnSet.has(newAlias)) {
48
+ throw new Error(`Internal Returning alias rewrite ${newAlias} collides with actual table column name. Please report this issue.`);
49
+ }
50
+ returningSelectKeyRemap.set(newAlias, item.alias);
51
+ return {
52
+ ...item,
53
+ alias: newAlias,
54
+ };
55
+ })
56
+ .filter(prostgles_types_1.isDefined)),
57
+ `${checkCondition} as ${CHECK_CONDITION_ALIAS}`,
58
+ ].filter(Boolean)}
56
59
  `;
57
60
  const allowedFieldKeys = tableHandler.parseFieldFilter(fields);
58
- const queryType = "one";
61
+ const queryType = "any";
59
62
  const tx = tableHandler.getTransaction(localParams)?.t;
60
63
  const queryPromise = tx ? tx[queryType](query) : tableHandler.db.tx((t) => t[queryType](query));
61
64
  const result = await queryPromise.catch((err) => (0, DboBuilder_1.rejectWithPGClientError)(err, {
@@ -65,22 +68,37 @@ const runInsertUpdateQuery = async (args) => {
65
68
  allowedKeys: allowedFieldKeys,
66
69
  prostgles: tableHandler.dboBuilder.prostgles,
67
70
  }));
68
- if (checkFilter && result.failed_check) {
71
+ if (checkFilter && result.some((row) => row[CHECK_CONDITION_ALIAS])) {
69
72
  throw new Error(`Insert ${name} records failed the check condition: ${JSON.stringify(checkFilter, null, 2)}`);
70
73
  }
71
- const rows = result.modified ?? [];
74
+ const rowCount = Number(result.length);
75
+ const returningRows = hasReturning ? [] : undefined;
76
+ const tableRows = result.map((row) => {
77
+ const { [CHECK_CONDITION_ALIAS]: _checkCondition, ...tableRowWithReturning } = row;
78
+ if (returningRows) {
79
+ const returningRow = {};
80
+ for (const [newAlias, expectedAlias] of returningSelectKeyRemap.entries()) {
81
+ returningRow[expectedAlias] = tableRowWithReturning[newAlias];
82
+ if (newAlias.startsWith(RETURNING_ALIAS_PREFIX)) {
83
+ delete tableRowWithReturning[newAlias];
84
+ }
85
+ }
86
+ returningRows.push(returningRow);
87
+ }
88
+ return tableRowWithReturning;
89
+ });
72
90
  await (0, executeAfterHooksCheckAndPostValidation_1.executeAfterHooksCheckAndPostValidation)({
73
91
  tableHandler,
74
92
  operation: command === "insert" ? { name: "insert", rule } : { name: "update", rule },
75
93
  localParams,
76
- rows,
94
+ rows: tableRows,
77
95
  data,
78
96
  });
79
97
  let returnMany = false;
80
98
  if (args.command === "update") {
81
99
  const { multi = true } = args.params || {};
82
- if (!multi && result.row_count && +result.row_count > 1) {
83
- throw `More than 1 row modified: ${result.row_count} rows affected`;
100
+ if (!multi && rowCount && rowCount > 1) {
101
+ throw `More than 1 row modified: ${rowCount} rows affected`;
84
102
  }
85
103
  if (hasReturning) {
86
104
  returnMany = multi;
@@ -91,11 +109,11 @@ const runInsertUpdateQuery = async (args) => {
91
109
  }
92
110
  if (!hasReturning)
93
111
  return undefined;
94
- const modified_returning = result.modified_returning?.map((d) => ({
95
- ...d,
112
+ const returningRowsWithNestedInserts = returningRows?.map((returningRow) => ({
113
+ ...returningRow,
96
114
  ...nestedInsertsResultsObj,
97
115
  }));
98
- return returnMany ? modified_returning : modified_returning?.[0];
116
+ return returnMany ? returningRowsWithNestedInserts : returningRowsWithNestedInserts?.[0];
99
117
  };
100
118
  exports.runInsertUpdateQuery = runInsertUpdateQuery;
101
119
  //# sourceMappingURL=runInsertUpdateQuery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,13 @@
1
1
  import type { AnyObject } from "prostgles-types";
2
2
  import type { FileTableConfig } from "../../ProstglesTypes";
3
3
  import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
4
- import type { LocalParams } from "../DboBuilder";
5
4
  import type { TableHandler } from "./TableHandler";
6
- type Args = {
7
- data: Buffer<ArrayBufferLike>;
8
- name: string;
5
+ import { type UploadFileArgs } from "./uploadFile";
6
+ type Args = Pick<UploadFileArgs, "localParams" | "data" | "original_name" | "original_last_modified"> & {
9
7
  filter: AnyObject;
10
- localParams: LocalParams | undefined;
11
8
  };
12
- export declare const updateFile: (tableHandler: TableHandler, config: FileTableConfig, { filter, data, name, localParams }: Args) => Promise<{
13
- newData: Omit<FileTableRow, "id">;
9
+ export declare const updateFile: (tableHandler: TableHandler, config: FileTableConfig, { filter, data, original_name, original_last_modified, localParams }: Args) => Promise<{
10
+ newData: Omit<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>, "id">;
14
11
  }>;
15
12
  export {};
16
13
  //# sourceMappingURL=updateFile.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"updateFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;CACtC,CAAC;AACF,eAAO,MAAM,UAAU,GACrB,cAAc,YAAY,EAC1B,QAAQ,eAAe,EACvB,qCAAqC,IAAI;;EA8B1C,CAAC"}
1
+ {"version":3,"file":"updateFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE/D,KAAK,IAAI,GAAG,IAAI,CACd,cAAc,EACd,aAAa,GAAG,MAAM,GAAG,eAAe,GAAG,wBAAwB,CACpE,GAAG;IACF,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AACF,eAAO,MAAM,UAAU,GACrB,cAAc,YAAY,EAC1B,QAAQ,eAAe,EACvB,sEAAsE,IAAI;;EAiC3E,CAAC"}
@@ -2,9 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateFile = void 0;
4
4
  const prostgles_types_1 = require("prostgles-types");
5
- const uploadFile_1 = require("../uploadFile");
6
- const updateFile = async (tableHandler, config, { filter, data, name, localParams }) => {
7
- const { data: validFilter } = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({ id: { optional: true, type: "string" } }, filter, "filter");
5
+ const uploadFile_1 = require("./uploadFile");
6
+ const updateFile = async (tableHandler, config, { filter, data, original_name, original_last_modified, localParams }) => {
7
+ const { data: validFilter } = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({ id: { optional: true, type: "string" } }, filter, "filter", undefined, { allowExtraProperties: false });
8
8
  const existingMediaId = validFilter?.id;
9
9
  if (!existingMediaId) {
10
10
  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" } `);
@@ -12,15 +12,16 @@ const updateFile = async (tableHandler, config, { filter, data, name, localParam
12
12
  const existingFile = (await tableHandler.findOne({
13
13
  id: existingMediaId,
14
14
  }));
15
- if (!existingFile?.name) {
15
+ if (!existingFile?.id) {
16
16
  throw new Error("Existing file record not found");
17
17
  }
18
- await config.storageClient.delete(existingFile.name);
18
+ await config.storageClient.delete(existingFile.id);
19
19
  const newFile = await (0, uploadFile_1.uploadFile)(config, {
20
- name: name,
20
+ original_name,
21
21
  data,
22
22
  localParams,
23
23
  mediaId: existingFile.id,
24
+ original_last_modified,
24
25
  });
25
26
  return { newData: (0, prostgles_types_1.omitKeys)(newFile, ["id"]) };
26
27
  };
@@ -1 +1 @@
1
- {"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AACA,qDAAgF;AAIhF,8CAA2C;AASpC,MAAM,UAAU,GAAG,KAAK,EAC7B,YAA0B,EAC1B,MAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAQ,EACzC,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qDAAmC,EAC/D,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAC1C,MAAM,EACN,QAAQ,CACT,CAAC;IACF,MAAM,eAAe,GAAG,WAAW,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC;QAC/C,EAAE,EAAE,eAAe;KACpB,CAAC,CAA6B,CAAC;IAEhC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAU,EAAC,MAAM,EAAE;QACvC,IAAI,EAAE,IAAI;QACV,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;KACzB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AAjCW,QAAA,UAAU,cAiCrB"}
1
+ {"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AACA,qDAAgF;AAIhF,6CAA+D;AAQxD,MAAM,UAAU,GAAG,KAAK,EAC7B,YAA0B,EAC1B,MAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,sBAAsB,EAAE,WAAW,EAAQ,EAC1E,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qDAAmC,EAC/D,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAC1C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAChC,CAAC;IACF,MAAM,eAAe,GAAG,WAAW,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC;QAC/C,EAAE,EAAE,eAAe;KACpB,CAAC,CAA6B,CAAC;IAEhC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAU,EAAC,MAAM,EAAE;QACvC,aAAa;QACb,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;QACxB,sBAAsB;KACvB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AApCW,QAAA,UAAU,cAoCrB"}
@@ -0,0 +1,31 @@
1
+ import { type JSONB } from "prostgles-types";
2
+ import type { FileTableConfig } from "../../ProstglesTypes";
3
+ import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
4
+ import type { LocalParams } from "../DboBuilder";
5
+ declare const FILE_SCHEMA: {
6
+ readonly id: {
7
+ readonly type: "string";
8
+ readonly optional: true;
9
+ };
10
+ readonly original_name: "string";
11
+ readonly original_last_modified: {
12
+ readonly type: "string";
13
+ readonly optional: true;
14
+ };
15
+ readonly data: "Blob";
16
+ };
17
+ type AssertFileObjectValid = (row: any) => asserts row is JSONB.GetObjectType<typeof FILE_SCHEMA>;
18
+ export declare const assertFileObjectValid: AssertFileObjectValid;
19
+ export type UploadFileArgs = {
20
+ data: Buffer<ArrayBufferLike>;
21
+ original_name: string;
22
+ original_last_modified: string | null;
23
+ localParams: LocalParams | undefined;
24
+ /**
25
+ * Used to update an existing file
26
+ */
27
+ mediaId: string | undefined;
28
+ };
29
+ export declare const uploadFile: (config: FileTableConfig, { data, original_name, original_last_modified, localParams, mediaId }: UploadFileArgs) => Promise<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>>;
30
+ export {};
31
+ //# sourceMappingURL=uploadFile.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAG3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,QAAA,MAAM,WAAW;;;;;;;;;;;CAKP,CAAC;AAEX,KAAK,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,WAAW,CAAC,CAAC;AAElG,eAAO,MAAM,qBAAqB,EAAE,qBAanC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,QAAQ,eAAe,EACvB,uEAAuE,cAAc,KACpF,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAwD5E,CAAC"}
@@ -3,39 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.uploadFile = exports.assertFileObjectValid = void 0;
4
4
  const crypto_1 = require("crypto");
5
5
  const prostgles_types_1 = require("prostgles-types");
6
- const getValidatedFileType_1 = require("../StorageClient/getValidatedFileType");
7
- const setupFileServeHandler_1 = require("../StorageClient/setupFileServeHandler");
6
+ const getValidatedFileType_1 = require("../../StorageClient/getValidatedFileType");
7
+ const setupFileServeHandler_1 = require("../../StorageClient/setupFileServeHandler");
8
8
  const FILE_SCHEMA = {
9
9
  id: { type: "string", optional: true },
10
- name: "string",
10
+ original_name: "string",
11
+ original_last_modified: { type: "string", optional: true },
11
12
  data: "Blob",
12
13
  };
13
14
  const assertFileObjectValid = (row) => {
14
- (0, prostgles_types_1.assertJSONBObjectAgainstSchema)(FILE_SCHEMA, row, "file insert");
15
+ const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)(FILE_SCHEMA, row, "file insert", undefined, {
16
+ allowExtraProperties: false,
17
+ });
18
+ if (validation.error) {
19
+ throw new Error(validation.error);
20
+ }
15
21
  };
16
22
  exports.assertFileObjectValid = assertFileObjectValid;
17
- const uploadFile = async (config, { data, name, localParams, mediaId }) => {
23
+ const uploadFile = async (config, { data, original_name, original_last_modified, localParams, mediaId }) => {
18
24
  const storageClient = config.storageClient;
19
25
  const media_id = mediaId ?? (0, crypto_1.randomUUID)();
20
26
  const nestedInsert = localParams?.nestedInsert;
21
27
  const type = await (0, getValidatedFileType_1.getValidatedFileType)(config, {
22
28
  file: data,
23
- fileName: name,
29
+ fileName: original_name,
24
30
  tableName: nestedInsert?.previousTable,
25
31
  colName: nestedInsert?.referencingColumn,
26
32
  });
27
- const media_name = `${media_id}.${type.ext}`;
28
- const _parsedMediaKeys = ["id", "name", "original_name", "extension", "content_type"];
33
+ const _parsedMediaKeys = ["id", "original_name", "extension", "content_type"];
29
34
  const coreInfo = {
30
35
  id: media_id,
31
- name: media_name,
32
- original_name: name,
36
+ original_name,
33
37
  extension: type.ext,
34
38
  content_type: type.mime,
35
39
  };
36
40
  const uploadedInfo = await storageClient.upload({
37
41
  file: data,
38
- fileName: coreInfo.name,
42
+ fileName: coreInfo.id,
39
43
  contentType: coreInfo.content_type,
40
44
  });
41
45
  const { contentLength, contentHash } = uploadedInfo;
@@ -45,18 +49,26 @@ const uploadFile = async (config, { data, name, localParams, mediaId }) => {
45
49
  const mediaRow = {
46
50
  signed_url: null,
47
51
  signed_url_expires: null,
48
- added: new Date().toISOString(),
52
+ updated: new Date().toISOString(),
49
53
  deleted: null,
50
54
  deleted_from_storage: null,
51
55
  description: "",
52
56
  ...coreInfo,
57
+ original_last_modified,
53
58
  cloud_url: url ?? "",
54
59
  etag: contentHash,
55
60
  extension: type.ext,
56
- url: [fileServeRoute, coreInfo.name].join("/"),
61
+ url: [fileServeRoute, coreInfo.id].join("/"),
57
62
  content_length: String(contentLength),
63
+ data: Buffer.from([0x01]),
58
64
  };
59
- return mediaRow;
65
+ const isInsert = !mediaId;
66
+ return isInsert ?
67
+ {
68
+ ...mediaRow,
69
+ added: new Date().toISOString(),
70
+ }
71
+ : mediaRow;
60
72
  };
61
73
  exports.uploadFile = uploadFile;
62
74
  //# sourceMappingURL=uploadFile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"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"}
@@ -23,6 +23,7 @@ export declare class ViewHandler {
23
23
  columns: TableSchema["columns"];
24
24
  columnsForTypes: ColumnInfo[];
25
25
  column_names: string[];
26
+ columnSet: Set<string>;
26
27
  tableOrViewInfo: TableSchema;
27
28
  tsColumnDefs: string[];
28
29
  joins: Join[];
@@ -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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"}
@@ -22,6 +22,7 @@ class ViewHandler {
22
22
  columns;
23
23
  columnsForTypes;
24
24
  column_names;
25
+ columnSet;
25
26
  tableOrViewInfo;
26
27
  tsColumnDefs = [];
27
28
  joins;
@@ -52,6 +53,7 @@ class ViewHandler {
52
53
  .slice(0)
53
54
  .sort((a, b) => a.name.localeCompare(b.name));
54
55
  this.column_names = tableOrViewInfo.columns.map((c) => c.name);
56
+ this.columnSet = new Set(this.column_names);
55
57
  this.dboBuilder = dboBuilder;
56
58
  this.joins = this.dboBuilder.joins;
57
59
  this.columnsForTypes.map(({ name, udt_name, is_nullable }) => {
@@ -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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"}
@@ -22,7 +22,7 @@ export declare const getDbTypes: (db: DB) => Promise<{
22
22
  }>;
23
23
  }>;
24
24
  export declare const getDetailedFieldInfo: ({ dataTypesMap, userTablesMap, userTableColumnsMap }: Awaited<ReturnType<typeof getDbTypes>>, fields: pg.IColumn[]) => {
25
- tsDataType: "string" | "number" | "boolean" | "any" | "string[]" | "number[]" | "boolean[]" | "any[]" | "ArrayBuffer";
25
+ tsDataType: "string" | "number" | "boolean" | "any" | "string[]" | "number[]" | "boolean[]" | "any[]" | "ArrayBuffer | Uint8Array";
26
26
  dataType: PG_COLUMN_UDT_DATA_TYPE;
27
27
  udt_name: PG_COLUMN_UDT_DATA_TYPE;
28
28
  tableName: string | undefined;
@@ -1,25 +1,27 @@
1
1
  import type { Prostgles } from "../Prostgles";
2
2
  import type { TableConfig } from "../TableConfig/TableConfigTypes";
3
3
  declare const FILE_TABLE_COLUMN_DEFINITIONS: {
4
- readonly name: "TEXT NOT NULL UNIQUE";
5
- readonly extension: "TEXT NOT NULL";
6
- readonly content_type: "TEXT NOT NULL";
7
- readonly content_length: "BIGINT NOT NULL DEFAULT 0";
8
- readonly added: "TIMESTAMP NOT NULL DEFAULT NOW()";
9
- readonly url: "TEXT NOT NULL";
10
4
  readonly id: "UUID PRIMARY KEY DEFAULT gen_random_uuid()";
5
+ readonly extension: "TEXT NOT NULL DEFAULT ''";
6
+ readonly content_type: "TEXT NOT NULL DEFAULT ''";
7
+ readonly content_length: "BIGINT NOT NULL DEFAULT 0";
8
+ readonly etag: "TEXT NOT NULL DEFAULT ''";
11
9
  readonly original_name: "TEXT NOT NULL";
10
+ readonly original_last_modified: "TIMESTAMPTZ";
12
11
  readonly description: "TEXT";
12
+ readonly url: "TEXT NOT NULL DEFAULT ''";
13
13
  readonly cloud_url: "TEXT";
14
14
  readonly signed_url: "TEXT";
15
15
  readonly signed_url_expires: "BIGINT";
16
- readonly etag: "TEXT NOT NULL";
17
- readonly deleted: "BIGINT";
18
- readonly deleted_from_storage: "BIGINT";
16
+ readonly added: "TIMESTAMP NOT NULL DEFAULT NOW()";
17
+ readonly updated: "TIMESTAMP NOT NULL DEFAULT NOW()";
18
+ readonly deleted: "TIMESTAMPTZ";
19
+ readonly deleted_from_storage: "TIMESTAMPTZ";
20
+ readonly data: "BYTEA NOT NULL CHECK (data = decode('01', 'hex'))";
19
21
  };
20
22
  type FileTableColumnDefinitions = typeof FILE_TABLE_COLUMN_DEFINITIONS;
21
23
  export type FileTableRow = {
22
- [K in keyof FileTableColumnDefinitions as K]: FileTableColumnDefinitions[K] extends (`${string} NOT NULL${string}` | `${string}PRIMARY KEY${string}`) ? string : string | null;
24
+ [K in keyof FileTableColumnDefinitions as K]: FileTableColumnDefinitions[K] extends (`BYTEA NOT NULL${string}`) ? Buffer : FileTableColumnDefinitions[K] extends (`${string} NOT NULL${string}` | `${string}PRIMARY KEY${string}`) ? string : string | null;
23
25
  };
24
26
  export declare const getFileTableConfig: (prg: Prostgles) => TableConfig | undefined;
25
27
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"getFileTableConfig.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAKnE,QAAA,MAAM,6BAA6B;;;;;;;;;;;;;;;;CAgBzB,CAAC;AAEX,KAAK,0BAA0B,GAAG,OAAO,6BAA6B,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;KACxB,CAAC,IAAI,MAAM,0BAA0B,IAAI,CAAC,GAAG,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAClF,GAAG,MAAM,YAAY,MAAM,EAAE,GAAG,GAAG,MAAM,cAAc,MAAM,EAAE,CAChE,GACC,MAAM,GACN,MAAM,GAAG,IAAI;CAChB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,KAAK,SAAS,KAAG,WAAW,GAAG,SAiHjE,CAAC"}
1
+ {"version":3,"file":"getFileTableConfig.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAKnE,QAAA,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;CAkBzB,CAAC;AAEX,KAAK,0BAA0B,GAAG,OAAO,6BAA6B,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;KACxB,CAAC,IAAI,MAAM,0BAA0B,IAAI,CAAC,GAAG,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAClF,iBAAiB,MAAM,EAAE,CAC1B,GACC,MAAM,GACN,0BAA0B,CAAC,CAAC,CAAC,SAAS,CACtC,GAAG,MAAM,YAAY,MAAM,EAAE,GAAG,GAAG,MAAM,cAAc,MAAM,EAAE,CAChE,GACC,MAAM,GACN,MAAM,GAAG,IAAI;CAChB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,KAAK,SAAS,KAAG,WAAW,GAAG,SAwHjE,CAAC"}