step 3

server/postgres.js

@@ -44,16 +44,29 @@ export function buildPoolConfig() {
   };
 }
 
+function attachPoolErrorHandler(pool) {
+  pool.on('error', (err) => {
+    console.error('PostgreSQL pool error:', err);
+  });
+  return pool;
+}
+
+export async function createRawPostgresPool() {
+  const pool = new Pool(buildPoolConfig());
+  return attachPoolErrorHandler(pool);
+}
+
+export async function applyPostgresSchema(pool) {
+  await pool.query(POSTGRES_SCHEMA_SQL);
+}
+
 async function createPool() {
   return createStandalonePostgresPool();
 }
 
 export async function createStandalonePostgresPool() {
-  const pool = new Pool(buildPoolConfig());
-  await pool.query(POSTGRES_SCHEMA_SQL);
-  pool.on('error', (err) => {
-    console.error('PostgreSQL pool error:', err);
-  });
+  const pool = await createRawPostgresPool();
+  await applyPostgresSchema(pool);
   return pool;
 }
 

server/postgresMigration.js

@@ -9,12 +9,13 @@ import {
   refreshStorageMode,
 } from './dataPaths.js';
 import {
-  createStandalonePostgresPool,
+  applyPostgresSchema,
+  createRawPostgresPool,
   encryptJsonPayload,
   makeLookupToken,
   makeOwnerLookup,
 } from './postgres.js';
-import { POSTGRES_SCHEMA_SQL } from './postgresSchema.js';
+import { APP_MANAGED_TABLES, POSTGRES_SCHEMA_SQL } from './postgresSchema.js';
 import { SUPABASE_URL } from './config.js';
 
 const TEMP_TTL_MS = 24 * 60 * 60 * 1000;
@@ -158,6 +159,10 @@ async function truncateTargetTables(pool) {
   `);
 }
 
+async function dropTargetTables(pool) {
+  await pool.query(`DROP TABLE IF EXISTS ${APP_MANAGED_TABLES.join(', ')} CASCADE`);
+}
+
 async function migrateVersions(pool, report) {
   const data = await readJsonIfExists(VERSION_FILE);
   const entries = Array.isArray(data) ? data : [];
@@ -546,7 +551,7 @@ export async function migrateLegacyDataToPostgres({ skipIfFolderExists = true }
 
   await fs.mkdir(DATA_ROOT, { recursive: true });
 
-  const pool = await createStandalonePostgresPool();
+  const pool = await createRawPostgresPool();
   const report = {
     startedAt: nowIso(),
     targetFolder: POSTGRES_STORAGE_DIR,
@@ -555,6 +560,8 @@ export async function migrateLegacyDataToPostgres({ skipIfFolderExists = true }
   };
 
   try {
+    await dropTargetTables(pool);
+    await applyPostgresSchema(pool);
     await truncateTargetTables(pool);
     await migrateVersions(pool, report);
     await migrateTempSessions(pool, report);

server/postgresSchema.js

@@ -1,3 +1,21 @@
+export const APP_MANAGED_TABLES = [
+  'media_blobs',
+  'media_entries',
+  'deleted_chats',
+  'memories',
+  'system_prompts',
+  'feedback_tickets',
+  'guest_request_counters',
+  'web_search_usage',
+  'user_settings',
+  'user_profiles',
+  'device_sessions',
+  'session_shares',
+  'chat_sessions',
+  'guest_state',
+  'app_versions',
+];
+
 export const POSTGRES_SCHEMA_SQL = `
 CREATE TABLE IF NOT EXISTS app_versions (
   public_url_lookup text PRIMARY KEY,