step 4

server/postgres.js

@@ -9,10 +9,11 @@ import {
   unpackEncryptedBuffer,
 } from './cryptoUtils.js';
 import { isPostgresStorageMode, POSTGRES_STORAGE_DIR, STORAGE_MODE } from './dataPaths.js';
-import { POSTGRES_SCHEMA_SQL } from './postgresSchema.js';
+import { APP_SCHEMA_NAME, POSTGRES_SCHEMA_SQL } from './postgresSchema.js';
 
 let poolInstance = null;
 let initPromise = null;
+const configuredClients = new WeakSet();
 
 function resolveSslConfig() {
   const raw = String(process.env.PGSSL || process.env.PGSSLMODE || '').trim().toLowerCase();
@@ -20,6 +21,30 @@ function resolveSslConfig() {
   return { rejectUnauthorized: false };
 }
 
+function getValidatedSchemaName() {
+  const schemaName = String(APP_SCHEMA_NAME || '').trim();
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(schemaName)) {
+    throw new Error(`Invalid POSTGRES_APP_SCHEMA value: ${schemaName}`);
+  }
+  return schemaName;
+}
+
+export function getPostgresSchemaName() {
+  return getValidatedSchemaName();
+}
+
+export function getCreateSchemaSql() {
+  return `CREATE SCHEMA IF NOT EXISTS "${getValidatedSchemaName()}"`;
+}
+
+export function getDropSchemaSql() {
+  return `DROP SCHEMA IF EXISTS "${getValidatedSchemaName()}" CASCADE`;
+}
+
+export function getSetSearchPathSql() {
+  return `SET search_path TO "${getValidatedSchemaName()}", public`;
+}
+
 export function buildPoolConfig() {
   const connectionString = process.env.DATABASE_URL || process.env.POSTGRES_URL || '';
   const ssl = resolveSslConfig();
@@ -56,8 +81,21 @@ export async function createRawPostgresPool() {
   return attachPoolErrorHandler(pool);
 }
 
+export async function preparePostgresClient(client) {
+  if (configuredClients.has(client)) return;
+  await client.query(getCreateSchemaSql());
+  await client.query(getSetSearchPathSql());
+  configuredClients.add(client);
+}
+
 export async function applyPostgresSchema(pool) {
-  await pool.query(POSTGRES_SCHEMA_SQL);
+  const client = await pool.connect();
+  try {
+    await preparePostgresClient(client);
+    await client.query(POSTGRES_SCHEMA_SQL);
+  } finally {
+    client.release();
+  }
 }
 
 async function createPool() {
@@ -99,6 +137,7 @@ export async function withPgClient(fn) {
   const pool = await getPostgresPool();
   const client = await pool.connect();
   try {
+    await preparePostgresClient(client);
     return await fn(client);
   } finally {
     client.release();

server/postgresMigration.js

@@ -12,10 +12,14 @@ import {
   applyPostgresSchema,
   createRawPostgresPool,
   encryptJsonPayload,
+  getCreateSchemaSql,
+  getDropSchemaSql,
+  getPostgresSchemaName,
+  getSetSearchPathSql,
   makeLookupToken,
   makeOwnerLookup,
 } from './postgres.js';
-import { APP_MANAGED_TABLES, POSTGRES_SCHEMA_SQL } from './postgresSchema.js';
+import { POSTGRES_SCHEMA_SQL } from './postgresSchema.js';
 import { SUPABASE_URL } from './config.js';
 
 const TEMP_TTL_MS = 24 * 60 * 60 * 1000;
@@ -136,31 +140,16 @@ async function fetchAllSupabaseRows(client, tableName) {
   return rows;
 }
 
-async function truncateTargetTables(pool) {
-  await pool.query(`
-    TRUNCATE TABLE
-      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
-    RESTART IDENTITY
-    CASCADE
-  `);
-}
-
-async function dropTargetTables(pool) {
-  await pool.query(`DROP TABLE IF EXISTS ${APP_MANAGED_TABLES.join(', ')} CASCADE`);
+async function resetBootstrapSchema(pool) {
+  const client = await pool.connect();
+  try {
+    await client.query('SET statement_timeout TO 0');
+    await client.query(getDropSchemaSql());
+    await client.query(getCreateSchemaSql());
+    await client.query(getSetSearchPathSql());
+  } finally {
+    client.release();
+  }
 }
 
 async function migrateVersions(pool, report) {
@@ -555,14 +544,14 @@ export async function migrateLegacyDataToPostgres({ skipIfFolderExists = true }
   const report = {
     startedAt: nowIso(),
     targetFolder: POSTGRES_STORAGE_DIR,
+    targetSchema: getPostgresSchemaName(),
     migrated: {},
     pending: [],
   };
 
   try {
-    await dropTargetTables(pool);
+    await resetBootstrapSchema(pool);
     await applyPostgresSchema(pool);
-    await truncateTargetTables(pool);
     await migrateVersions(pool, report);
     await migrateTempSessions(pool, report);
     await migrateMemories(pool, report);

server/postgresSchema.js

@@ -1,20 +1,4 @@
-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 APP_SCHEMA_NAME = process.env.POSTGRES_APP_SCHEMA || 'inferenceport_backend';
 
 export const POSTGRES_SCHEMA_SQL = `
 CREATE TABLE IF NOT EXISTS app_versions (