prostgles-server 4.2.576 → 4.2.577

package/dist/StorageClient/getFileTableConfig.js

@@ -3,25 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileTableConfig = void 0;
 const prostgles_types_1 = require("prostgles-types");
 const updateFile_1 = require("../DboBuilder/TableHandler/updateFile");
-const uploadFile_1 = require("../DboBuilder/uploadFile");
+const uploadFile_1 = require("../DboBuilder/TableHandler/uploadFile");
 const setupFileServeHandler_1 = require("./setupFileServeHandler");
 const onDeleteFromFileTable_1 = require("../DboBuilder/TableHandler/onDeleteFromFileTable");
 const FILE_TABLE_COLUMN_DEFINITIONS = {
-    name: `TEXT NOT NULL UNIQUE`,
-    extension: `TEXT NOT NULL`,
-    content_type: `TEXT NOT NULL`,
-    content_length: `BIGINT NOT NULL DEFAULT 0`,
-    added: `TIMESTAMP NOT NULL DEFAULT NOW()`,
-    url: `TEXT NOT NULL`,
     id: `UUID PRIMARY KEY DEFAULT gen_random_uuid()`,
+    extension: `TEXT NOT NULL DEFAULT ''`,
+    content_type: `TEXT NOT NULL DEFAULT ''`,
+    content_length: `BIGINT NOT NULL DEFAULT 0`,
+    etag: `TEXT NOT NULL DEFAULT ''`,
     original_name: `TEXT NOT NULL`,
+    original_last_modified: `TIMESTAMPTZ`,
     description: `TEXT`,
+    url: `TEXT NOT NULL DEFAULT ''`,
     cloud_url: `TEXT`,
     signed_url: `TEXT`,
     signed_url_expires: `BIGINT`,
-    etag: `TEXT NOT NULL`,
-    deleted: `BIGINT`,
-    deleted_from_storage: `BIGINT`,
+    added: `TIMESTAMP NOT NULL DEFAULT NOW()`,
+    updated: `TIMESTAMP NOT NULL DEFAULT NOW()`,
+    deleted: `TIMESTAMPTZ`,
+    deleted_from_storage: `TIMESTAMPTZ`,
+    data: `BYTEA NOT NULL CHECK (data = decode('01', 'hex'))`, // Used as a placeholder to ensure insert types are correct. Actual data is uploaded to storageClient and not stored in the DB
 };
 const getFileTableConfig = (prg) => {
     const { fileTable, tableConfig } = prg.opts;
@@ -74,14 +76,15 @@ const getFileTableConfig = (prg) => {
                             if (!tableHandler)
                                 throw "Storage tableHandler not found";
                             (0, uploadFile_1.assertFileObjectValid)(insertData);
-                            const { data: dataBlob, name, id } = insertData;
+                            const { data: dataBlob, original_name, id, original_last_modified = null, } = insertData;
                             const data = dataBlob;
                             if (command === "update") {
                                 const { newData } = await (0, updateFile_1.updateFile)(tableHandler, fileTable, {
                                     filter: filter ?? {},
                                     localParams,
                                     data,
-                                    name,
+                                    original_name,
+                                    original_last_modified,
                                 });
                                 return {
                                     row: newData,
@@ -92,9 +95,10 @@ const getFileTableConfig = (prg) => {
                             }
                             const media = await (0, uploadFile_1.uploadFile)(fileTable, {
                                 data,
-                                name,
+                                original_name,
                                 localParams,
                                 mediaId: id,
+                                original_last_modified,
                             });
                             return {
                                 row: media,

package/dist/StorageClient/getFileTableConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileTableConfig.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getFileTableConfig.js","sourceRoot":"","sources":["../../lib/StorageClient/getFileTableConfig.ts"],"names":[],"mappings":"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"}

package/dist/StorageClient/setupFileServeHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupFileServeHandler.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/setupFileServeHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAI7B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,iBAAiB,GAAI,QAAQ,eAAe,WAOxD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,IAAI,EAAE,EACN,QAAQ,eAAe,EACvB,eAAe,aAAa,EAC5B,KAAK,CAAC,CAAC,OAAO,EACd,KAAK,SAAS;;CAkFf,CAAC"}
+{"version":3,"file":"setupFileServeHandler.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/setupFileServeHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAI7B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,iBAAiB,GAAI,QAAQ,eAAe,WAOxD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,IAAI,EAAE,EACN,QAAQ,eAAe,EACvB,eAAe,aAAa,EAC5B,KAAK,CAAC,CAAC,OAAO,EACd,KAAK,SAAS;;CAiFf,CAAC"}

package/dist/StorageClient/setupFileServeHandler.js

@@ -50,18 +50,16 @@ exports.getFileServeRoute = getFileServeRoute;
 const setupFileServeHandler = (db, config, storageClient, app, prg) => {
     const fileTableName = config.tableName;
     const fileServeRoute = (0, exports.getFileServeRoute)(config);
-    const fileRouteExpress = fileServeRoute + "/:name";
+    const fileRouteExpress = fileServeRoute + "/:id";
     app.get(fileRouteExpress, async (req, res) => {
         try {
-            const { name } = req.params;
-            if (typeof name !== "string" || !name) {
+            const { id } = req.params;
+            if (typeof id !== "string" || !id) {
                 throw "Invalid media name";
             }
-            const id = name.slice(0, 36);
             const selectParams = {
                 select: {
                     id: 1,
-                    name: 1,
                     signed_url: 1,
                     signed_url_expires: 1,
                     content_type: 1,
@@ -87,7 +85,7 @@ const setupFileServeHandler = (db, config, storageClient, app, prg) => {
                 const HOUR = 3600 * 1000;
                 const EXPIRES = Date.now() + HOUR;
                 if (!url || expires < EXPIRES) {
-                    url = await storageClient.getSignedUrlForDownload(file.name, 60 * 60);
+                    url = await storageClient.getSignedUrlForDownload(file.id, 60 * 60);
                     await db.any("UPDATE ${fileTableName:name} SET signed_url = ${signed_url}, signed_url_expires = ${signed_url_expires} WHERE id = ${id}", {
                         fileTableName,
                         id: file.id,
@@ -98,7 +96,7 @@ const setupFileServeHandler = (db, config, storageClient, app, prg) => {
                 res.redirect(url);
             }
             else {
-                const localFilePath = (0, path_1.join)(storageClient.localFolderPath, file.name);
+                const localFilePath = (0, path_1.join)(storageClient.localFolderPath, file.id);
                 if (!fs.existsSync(localFilePath)) {
                     throw new Error("File not found");
                 }

package/dist/StorageClient/setupFileServeHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupFileServeHandler.js","sourceRoot":"","sources":["../../lib/StorageClient/setupFileServeHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setupFileServeHandler.js","sourceRoot":"","sources":["../../lib/StorageClient/setupFileServeHandler.ts"],"names":[],"mappings":"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"}

package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts

@@ -307,7 +307,7 @@ export class SelectItemBuilder {
                 /* Join */
               } else {
                 if (!joinParse) {
-                  throw "Joins dissalowed";
+                  throw "Joins disallowed";
                 }
                 await joinParse(key, val as JoinSelect, throwErr);
               }

package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts

@@ -31,7 +31,7 @@ export const onDeleteFromFileTable = async (
     return (isOneOrNone ? result[0] : result) as undefined | AnyObject[];
   }
 
-  let files: { id: string; name: string }[] = [];
+  let files: { id: string }[] = [];
   const totalFiles = await tableHandler.count(filterOpts.filter);
   do {
     const batch = (await tableHandler.find(filterOpts.filter, {
@@ -46,11 +46,11 @@ export const onDeleteFromFileTable = async (
   }
   /** If any table delete fails then do not delete files */
   for (const file of files) {
-    await storageClient.delete(file.name);
+    await storageClient.delete(file.id);
   }
 
   if (returningQuery) {
-    return files.map((f) => pickKeys(f, ["id", "name"]));
+    return files.map((f) => pickKeys(f, ["id"]));
   }
 
   return undefined;

package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts

@@ -1,5 +1,5 @@
 import type { AnyObject, FieldFilter, InsertParams, UpdateParams } from "prostgles-types";
-import { asName } from "prostgles-types";
+import { asName, isDefined } from "prostgles-types";
 import type { InsertRule, UpdateRule } from "../../PublishParser/PublishParser";
 import type { LocalParams } from "../DboBuilder";
 import { rejectWithPGClientError, withUserRLS } from "../DboBuilder";
@@ -51,7 +51,8 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
     tableHandler.parseFieldFilter(returningFields),
   );
   const { checkFilter } = rule ?? {};
-  let checkCondition = "WHERE FALSE";
+  // let checkCondition = "WHERE FALSE";
+  let checkCondition = "FALSE";
   if (checkFilter) {
     const checkCond = await tableHandler.prepareWhere({
       select: undefined,
@@ -60,53 +61,60 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
       filter: checkFilter,
       addWhere: false,
     });
-    checkCondition = `WHERE NOT (${checkCond.where})`;
+    // checkCondition = `WHERE NOT (${checkCond.where})`;
+    checkCondition = `NOT (${checkCond.where})`;
   }
   const hasReturning = !!returningSelectItems.length;
   const userRLS = withUserRLS(localParams, "");
-  const escapedTableName = asName(name);
+  const CHECK_CONDITION_ALIAS = "prostgles_check_condition";
+  const RETURNING_ALIAS_PREFIX = "prostgles_returning_";
+  const returningSelectKeyRemap = new Map<string, string>();
   const query = ` 
-    ${userRLS}
-    WITH ${escapedTableName} AS (
-      ${queryWithoutUserRLS}
-      RETURNING *
-    )
-    SELECT 
-      count(*) as row_count, 
-      EXISTS (
-        SELECT *
-        FROM ${escapedTableName}
-        ${checkCondition} 
-      ) AS failed_check,
-      (
-        SELECT json_agg(item)
-        FROM (
-          SELECT *
-          FROM ${escapedTableName}
-        ) item
-      ) as modified,
-      (
-        SELECT json_agg(item)
-        FROM (
-          SELECT ${!hasReturning ? "1" : getSelectItemQuery(returningSelectItems)}
-          FROM ${escapedTableName}
-          WHERE ${hasReturning ? "TRUE" : "FALSE"}
-        ) item
-      ) as modified_returning
-    FROM ${escapedTableName}
+    ${userRLS} 
+    ${queryWithoutUserRLS}
+    RETURNING ${[
+      "*",
+      getSelectItemQuery(
+        returningSelectItems
+          .map((item, index) => {
+            /** Skip if exists in 'returning *'  */
+            if (item.type === "column" && asName(item.alias) === item.getQuery()) {
+              if (!tableHandler.columnSet.has(item.alias)) {
+                throw new Error(`Returning column ${item.alias} does not exist in table ${name}`);
+              }
+              returningSelectKeyRemap.set(item.alias, item.alias);
+              return;
+            }
+            const newAlias = RETURNING_ALIAS_PREFIX + index;
+            if (tableHandler.columnSet.has(newAlias)) {
+              throw new Error(
+                `Internal Returning alias rewrite ${newAlias} collides with actual table column name. Please report this issue.`,
+              );
+            }
+            returningSelectKeyRemap.set(newAlias, item.alias);
+
+            return {
+              ...item,
+              alias: newAlias,
+            };
+          })
+          .filter(isDefined),
+      ),
+      `${checkCondition} as ${CHECK_CONDITION_ALIAS}`,
+    ].filter(Boolean)}
   `;
 
   const allowedFieldKeys = tableHandler.parseFieldFilter(fields);
 
-  const queryType = "one";
+  const queryType = "any";
 
   const tx = tableHandler.getTransaction(localParams)?.t;
-  const queryPromise: Promise<{
-    row_count: number | null;
-    modified: AnyObject[] | null;
-    failed_check: boolean | null;
-    modified_returning: AnyObject[] | null;
-  }> = tx ? tx[queryType](query) : tableHandler.db.tx((t) => t[queryType](query));
+  const queryPromise: Promise<
+    {
+      [CHECK_CONDITION_ALIAS]: boolean;
+      [key: string]: unknown;
+    }[]
+  > = tx ? tx[queryType](query) : tableHandler.db.tx((t) => t[queryType](query));
 
   const result = await queryPromise.catch((err: unknown) =>
     rejectWithPGClientError(err, {
@@ -118,27 +126,44 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
     }),
   );
 
-  if (checkFilter && result.failed_check) {
+  if (checkFilter && result.some((row) => row[CHECK_CONDITION_ALIAS])) {
     throw new Error(
       `Insert ${name} records failed the check condition: ${JSON.stringify(checkFilter, null, 2)}`,
     );
   }
 
-  const rows = result.modified ?? [];
+  const rowCount = Number(result.length);
+  const returningRows = hasReturning ? ([] as AnyObject[]) : undefined;
+
+  const tableRows = result.map((row) => {
+    const { [CHECK_CONDITION_ALIAS]: _checkCondition, ...tableRowWithReturning } = row;
+    if (returningRows) {
+      const returningRow: AnyObject = {};
+      for (const [newAlias, expectedAlias] of returningSelectKeyRemap.entries()) {
+        returningRow[expectedAlias] = tableRowWithReturning[newAlias];
+        if (newAlias.startsWith(RETURNING_ALIAS_PREFIX)) {
+          delete tableRowWithReturning[newAlias];
+        }
+      }
+      returningRows.push(returningRow);
+    }
+
+    return tableRowWithReturning;
+  });
 
   await executeAfterHooksCheckAndPostValidation({
     tableHandler,
     operation: command === "insert" ? { name: "insert", rule } : { name: "update", rule },
     localParams,
-    rows,
+    rows: tableRows,
     data,
   });
 
   let returnMany = false;
   if (args.command === "update") {
     const { multi = true } = args.params || {};
-    if (!multi && result.row_count && +result.row_count > 1) {
-      throw `More than 1 row modified: ${result.row_count} rows affected`;
+    if (!multi && rowCount && rowCount > 1) {
+      throw `More than 1 row modified: ${rowCount} rows affected`;
     }
 
     if (hasReturning) {
@@ -150,10 +175,10 @@ export const runInsertUpdateQuery = async (args: RunInsertUpdateQueryArgs) => {
 
   if (!hasReturning) return undefined;
 
-  const modified_returning = result.modified_returning?.map((d) => ({
-    ...d,
+  const returningRowsWithNestedInserts = returningRows?.map((returningRow) => ({
+    ...returningRow,
     ...nestedInsertsResultsObj,
   }));
 
-  return returnMany ? modified_returning : modified_returning?.[0];
+  return returnMany ? returningRowsWithNestedInserts : returningRowsWithNestedInserts?.[0];
 };

package/lib/DboBuilder/TableHandler/updateFile.ts

@@ -2,25 +2,26 @@ import type { AnyObject } from "prostgles-types";
 import { getJSONBObjectSchemaValidationError, omitKeys } from "prostgles-types";
 import type { FileTableConfig } from "../../ProstglesTypes";
 import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
-import type { LocalParams } from "../DboBuilder";
-import { uploadFile } from "../uploadFile";
 import type { TableHandler } from "./TableHandler";
+import { uploadFile, type UploadFileArgs } from "./uploadFile";
 
-type Args = {
-  data: Buffer<ArrayBufferLike>;
-  name: string;
+type Args = Pick<
+  UploadFileArgs,
+  "localParams" | "data" | "original_name" | "original_last_modified"
+> & {
   filter: AnyObject;
-  localParams: LocalParams | undefined;
 };
 export const updateFile = async (
   tableHandler: TableHandler,
   config: FileTableConfig,
-  { filter, data, name, localParams }: Args,
+  { filter, data, original_name, original_last_modified, localParams }: Args,
 ) => {
   const { data: validFilter } = getJSONBObjectSchemaValidationError(
     { id: { optional: true, type: "string" } },
     filter,
     "filter",
+    undefined,
+    { allowExtraProperties: false },
   );
   const existingMediaId = validFilter?.id;
   if (!existingMediaId) {
@@ -33,16 +34,17 @@ export const updateFile = async (
     id: existingMediaId,
   })) as FileTableRow | undefined;
 
-  if (!existingFile?.name) {
+  if (!existingFile?.id) {
     throw new Error("Existing file record not found");
   }
 
-  await config.storageClient.delete(existingFile.name);
+  await config.storageClient.delete(existingFile.id);
   const newFile = await uploadFile(config, {
-    name: name,
+    original_name,
     data,
     localParams,
     mediaId: existingFile.id,
+    original_last_modified,
   });
   return { newData: omitKeys(newFile, ["id"]) };
 };

package/lib/DboBuilder/{uploadFile.ts → TableHandler/uploadFile.ts}

@@ -1,26 +1,39 @@
 import { randomUUID } from "crypto";
-import { assertJSONBObjectAgainstSchema, type JSONB } from "prostgles-types";
-import type { FileTableConfig } from "../ProstglesTypes";
-import type { FileTableRow } from "../StorageClient/getFileTableConfig";
-import { getValidatedFileType } from "../StorageClient/getValidatedFileType";
-import { getFileServeRoute } from "../StorageClient/setupFileServeHandler";
-import type { LocalParams } from "./DboBuilder";
+import { getJSONBObjectSchemaValidationError, type JSONB } from "prostgles-types";
+import type { FileTableConfig } from "../../ProstglesTypes";
+import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
+import { getValidatedFileType } from "../../StorageClient/getValidatedFileType";
+import { getFileServeRoute } from "../../StorageClient/setupFileServeHandler";
+import type { LocalParams } from "../DboBuilder";
 
 const FILE_SCHEMA = {
   id: { type: "string", optional: true },
-  name: "string",
+  original_name: "string",
+  original_last_modified: { type: "string", optional: true },
   data: "Blob",
 } as const;
 
 type AssertFileObjectValid = (row: any) => asserts row is JSONB.GetObjectType<typeof FILE_SCHEMA>;
 
 export const assertFileObjectValid: AssertFileObjectValid = (row) => {
-  assertJSONBObjectAgainstSchema(FILE_SCHEMA, row, "file insert");
+  const validation = getJSONBObjectSchemaValidationError(
+    FILE_SCHEMA,
+    row,
+    "file insert",
+    undefined,
+    {
+      allowExtraProperties: false,
+    },
+  );
+  if (validation.error) {
+    throw new Error(validation.error);
+  }
 };
 
-type UploadFileArgs = {
+export type UploadFileArgs = {
   data: Buffer<ArrayBufferLike>;
-  name: string;
+  original_name: string;
+  original_last_modified: string | null;
   localParams: LocalParams | undefined;
   /**
    * Used to update an existing file
@@ -30,31 +43,30 @@ type UploadFileArgs = {
 
 export const uploadFile = async (
   config: FileTableConfig,
-  { data, name, localParams, mediaId }: UploadFileArgs,
-): Promise<FileTableRow> => {
+  { data, original_name, original_last_modified, localParams, mediaId }: UploadFileArgs,
+): Promise<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>> => {
   const storageClient = config.storageClient;
 
   const media_id = mediaId ?? randomUUID();
   const nestedInsert = localParams?.nestedInsert;
   const type = await getValidatedFileType(config, {
     file: data,
-    fileName: name,
+    fileName: original_name,
     tableName: nestedInsert?.previousTable,
     colName: nestedInsert?.referencingColumn,
   });
-  const media_name = `${media_id}.${type.ext}`;
-  const _parsedMediaKeys = ["id", "name", "original_name", "extension", "content_type"] as const;
+
+  const _parsedMediaKeys = ["id", "original_name", "extension", "content_type"] as const;
   const coreInfo: Required<Pick<FileTableRow, (typeof _parsedMediaKeys)[number]>> = {
     id: media_id,
-    name: media_name,
-    original_name: name,
+    original_name,
     extension: type.ext,
     content_type: type.mime,
   };
 
   const uploadedInfo = await storageClient.upload({
     file: data,
-    fileName: coreInfo.name,
+    fileName: coreInfo.id,
     contentType: coreInfo.content_type,
   });
 
@@ -63,20 +75,29 @@ export const uploadFile = async (
   const { url } = uploadedInfo.type === "cloud" ? uploadedInfo : {};
 
   const fileServeRoute = getFileServeRoute(config);
-  const mediaRow: FileTableRow = {
+  const mediaRow: Omit<FileTableRow, "added"> = {
     signed_url: null,
     signed_url_expires: null,
-    added: new Date().toISOString(),
+    updated: new Date().toISOString(),
     deleted: null,
     deleted_from_storage: null,
     description: "",
     ...coreInfo,
+    original_last_modified,
     cloud_url: url ?? "",
     etag: contentHash,
     extension: type.ext,
-    url: [fileServeRoute, coreInfo.name].join("/"),
+    url: [fileServeRoute, coreInfo.id].join("/"),
     content_length: String(contentLength),
+    data: Buffer.from([0x01]),
   };
 
-  return mediaRow;
+  const isInsert = !mediaId;
+
+  return isInsert ?
+      {
+        ...mediaRow,
+        added: new Date().toISOString(),
+      }
+    : mediaRow;
 };

package/lib/DboBuilder/ViewHandler/ViewHandler.ts

@@ -46,6 +46,7 @@ export class ViewHandler {
   columns: TableSchema["columns"];
   columnsForTypes: ColumnInfo[];
   column_names: string[];
+  columnSet: Set<string>;
   tableOrViewInfo: TableSchema;
   tsColumnDefs: string[] = [];
   joins: Join[];
@@ -96,6 +97,7 @@ export class ViewHandler {
       .sort((a, b) => a.name.localeCompare(b.name));
 
     this.column_names = tableOrViewInfo.columns.map((c) => c.name);
+    this.columnSet = new Set(this.column_names);
 
     this.dboBuilder = dboBuilder;
     this.joins = this.dboBuilder.joins;

package/lib/StorageClient/getFileTableConfig.ts

@@ -1,6 +1,6 @@
 import { omitKeys } from "prostgles-types";
 import { updateFile } from "../DboBuilder/TableHandler/updateFile";
-import { assertFileObjectValid, uploadFile } from "../DboBuilder/uploadFile";
+import { assertFileObjectValid, uploadFile } from "../DboBuilder/TableHandler/uploadFile";
 import type { Prostgles } from "../Prostgles";
 import type { TableConfig } from "../TableConfig/TableConfigTypes";
 import { setupFileServeHandler } from "./setupFileServeHandler";
@@ -8,27 +8,33 @@ import { onDeleteFromFileTable } from "../DboBuilder/TableHandler/onDeleteFromFi
 import type { BeforeEachTsTrigger } from "../PublishParser/publishTypesAndUtils";
 
 const FILE_TABLE_COLUMN_DEFINITIONS = {
-  name: `TEXT NOT NULL UNIQUE`,
-  extension: `TEXT NOT NULL`,
-  content_type: `TEXT NOT NULL`,
-  content_length: `BIGINT NOT NULL DEFAULT 0`,
-  added: `TIMESTAMP NOT NULL DEFAULT NOW()`,
-  url: `TEXT NOT NULL`,
   id: `UUID PRIMARY KEY DEFAULT gen_random_uuid()`,
+  extension: `TEXT NOT NULL DEFAULT ''`,
+  content_type: `TEXT NOT NULL DEFAULT ''`,
+  content_length: `BIGINT NOT NULL DEFAULT 0`,
+  etag: `TEXT NOT NULL DEFAULT ''`,
   original_name: `TEXT NOT NULL`,
+  original_last_modified: `TIMESTAMPTZ`,
   description: `TEXT`,
+  url: `TEXT NOT NULL DEFAULT ''`,
   cloud_url: `TEXT`,
   signed_url: `TEXT`,
   signed_url_expires: `BIGINT`,
-  etag: `TEXT NOT NULL`,
-  deleted: `BIGINT`,
-  deleted_from_storage: `BIGINT`,
+  added: `TIMESTAMP NOT NULL DEFAULT NOW()`,
+  updated: `TIMESTAMP NOT NULL DEFAULT NOW()`,
+  deleted: `TIMESTAMPTZ`,
+  deleted_from_storage: `TIMESTAMPTZ`,
+  data: `BYTEA NOT NULL CHECK (data = decode('01', 'hex'))`, // Used as a placeholder to ensure insert types are correct. Actual data is uploaded to storageClient and not stored in the DB
 } as const;
 
 type FileTableColumnDefinitions = typeof FILE_TABLE_COLUMN_DEFINITIONS;
 
 export type FileTableRow = {
   [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
@@ -101,14 +107,20 @@ export const getFileTableConfig = (prg: Prostgles): TableConfig | undefined => {
               if (!tableHandler) throw "Storage tableHandler not found";
               assertFileObjectValid(insertData);
 
-              const { data: dataBlob, name, id } = insertData;
+              const {
+                data: dataBlob,
+                original_name,
+                id,
+                original_last_modified = null,
+              } = insertData;
               const data = dataBlob as unknown as Buffer;
               if (command === "update") {
                 const { newData } = await updateFile(tableHandler, fileTable, {
                   filter: filter ?? {},
                   localParams,
                   data,
-                  name,
+                  original_name,
+                  original_last_modified,
                 });
                 return {
                   row: newData,
@@ -120,9 +132,10 @@ export const getFileTableConfig = (prg: Prostgles): TableConfig | undefined => {
 
               const media = await uploadFile(fileTable, {
                 data,
-                name,
+                original_name,
                 localParams,
                 mediaId: id,
+                original_last_modified,
               });
 
               return {