Fix Postgate compatibility issues in worker queries

- Add asUuid() helper to cast text columns to UUID in joins
- Fix findWorkerAssetsBinding join syntax (was generating double =)
- Add enumCast for enum_binding_type comparison with Postgate
- Restore accessKeyId/secretAccessKey in StorageConfigRow (needed for S3 credentials)

Fixes: Database error on worker upload via Postgate HTTP proxy

Author: max-lt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openworkers-api",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "license": "MIT",
   "module": "src/index.ts",
   "type": "module",

src/services/db/kysely-helpers.ts

@@ -126,3 +126,13 @@ export const byteaToText = (column: string): RawBuilder<string> => {
 export const enumToText = <T = string>(column: string): RawBuilder<T> => {
   return sql<T>`${sql.ref(column)}::text`;
 };
+
+/**
+ * Cast text column to UUID
+ * @example
+ * .innerJoin('table as t', (join) => join.on('t.id', '=', asUuid('ev.value')))
+ * // Generates: t.id = ev.value::uuid
+ */
+export const asUuid = (column: string): RawBuilder<string> => {
+  return sql<string>`${sql.ref(column)}::uuid`;
+};

src/services/db/storage.ts

@@ -8,14 +8,25 @@ export interface StorageConfigRow {
   desc: string | null;
   bucket: string;
   prefix: string | null;
+  accessKeyId: string;
+  secretAccessKey: string;
   endpoint: string | null;
   region: string | null;
   publicUrl: string | null;
   createdAt: Date;
   updatedAt: Date;
 }
 
-const storageConfigSelect = [...resourceSelect, 'bucket', 'prefix', 'endpoint', 'region', 'publicUrl'] as const;
+const storageConfigSelect = [
+  ...resourceSelect,
+  'bucket',
+  'prefix',
+  'endpoint',
+  'region',
+  'publicUrl',
+  'accessKeyId',
+  'secretAccessKey'
+] as const;
 
 export async function findAllStorageConfigs(userId: string): Promise<StorageConfigRow[]> {
   return kysely

src/services/db/workers.ts

@@ -1,5 +1,5 @@
 import { kysely } from './kysely-client';
-import { uuid, uuidOrNull, enumCast, base64Decode, byteaToText, enumToText } from './kysely-helpers';
+import { uuid, uuidOrNull, enumCast, base64Decode, byteaToText, enumToText, asUuid } from './kysely-helpers';
 import type { IWorker, IWorkerLanguage } from '../../types';
 import { sha256Hex } from '../../utils/crypto';
 import { stringToBase64 } from '../../utils/base64';
@@ -275,7 +275,7 @@ export async function findWorkerAssetsBinding(userId: string, workerId: string):
   const binding = await kysely
     .selectFrom('workers as w')
     .innerJoin('environmentValues as ev', 'ev.environmentId', 'w.environmentId')
-    .innerJoin('storageConfigs as sc', (join) => join.on('sc.id', '=', sql`sc.id = ev.value::uuid`))
+    .innerJoin('storageConfigs as sc', (join) => join.on('sc.id', '=', asUuid('ev.value')))
     .select([
       'sc.id as storageConfigId',
       'sc.bucket',
@@ -287,7 +287,7 @@ export async function findWorkerAssetsBinding(userId: string, workerId: string):
     ])
     .where('w.id', '=', uuid(workerId))
     .where('w.userId', '=', uuid(userId))
-    .where('ev.type', '=', 'assets')
+    .where('ev.type', '=', enumCast('assets', 'enum_binding_type'))
     .executeTakeFirst();
 
   return binding ?? null;