admindb 2.3.0 → 2.4.0

package/dist/routes/api/tables.js

@@ -4,20 +4,22 @@ exports.registerTableRoutes = registerTableRoutes;
 const generator_1 = require("../../sql/generator");
 const helpers_1 = require("./helpers");
 function registerTableRoutes(router, ctx) {
-    const { db } = ctx;
-    router.get('/api/tables', (0, helpers_1.wrap)(async (_req, res) => {
+    router.get('/api/tables/:db', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const r = await db.listTables();
         if (!r.success)
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to list tables.', 500);
         (0, helpers_1.ok)(res, r.data);
     }));
-    router.get('/api/tables/:table/info', (0, helpers_1.wrap)(async (req, res) => {
+    router.get('/api/tables/:db/:table/info', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const info = await (0, helpers_1.requireTable)(db, req.params.table);
         if (!info)
             return (0, helpers_1.fail)(res, `Table "${req.params.table}" does not exist.`, 404);
         (0, helpers_1.ok)(res, info);
     }));
-    router.get('/api/tables/:table/fk-options', (0, helpers_1.wrap)(async (req, res) => {
+    router.get('/api/tables/:db/:table/fk-options', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const info = await (0, helpers_1.requireTable)(db, req.params.table);
         if (!info)
             return (0, helpers_1.fail)(res, `Table "${req.params.table}" does not exist.`, 404);
@@ -42,7 +44,8 @@ function registerTableRoutes(router, ctx) {
         }
         (0, helpers_1.ok)(res, options);
     }));
-    router.get('/api/tables/:table/ddl', (0, helpers_1.wrap)(async (req, res) => {
+    router.get('/api/tables/:db/:table/ddl', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const r = await db.getCreateStatement(req.params.table);
         if (!r.success)
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to fetch DDL.', 500);
@@ -50,7 +53,8 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, `Table "${req.params.table}" does not exist.`, 404);
         (0, helpers_1.ok)(res, { sql: r.data });
     }));
-    router.post('/api/tables/:table/rename', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db/:table/rename', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const newName = String(req.body?.name ?? '').trim();
         if (!newName)
             return (0, helpers_1.fail)(res, 'New table name is required.');
@@ -59,13 +63,15 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to rename table.');
         (0, helpers_1.ok)(res, { message: `Table renamed to "${newName}".`, name: newName });
     }));
-    router.delete('/api/tables/:table', (0, helpers_1.wrap)(async (req, res) => {
+    router.delete('/api/tables/:db/:table', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const r = await db.dropTable(req.params.table);
         if (!r.success)
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to drop table.');
         (0, helpers_1.ok)(res, { message: `Table "${req.params.table}" dropped.` });
     }));
-    router.post('/api/tables/bulk-drop', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db/bulk-drop', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const tables = Array.isArray(req.body?.tables)
             ? req.body.tables.filter((t) => typeof t === 'string' && t.trim().length > 0)
             : [];
@@ -97,7 +103,8 @@ function registerTableRoutes(router, ctx) {
             message: `Dropped ${dropped.length} table(s)${failed.length ? `, ${failed.length} failed` : ''}.`,
         });
     }));
-    router.post('/api/tables/bulk-truncate', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db/bulk-truncate', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const tables = Array.isArray(req.body?.tables)
             ? req.body.tables.filter((t) => typeof t === 'string' && t.trim().length > 0)
             : [];
@@ -129,7 +136,7 @@ function registerTableRoutes(router, ctx) {
             message: `Cleared ${cleared.length} table(s)${failed.length ? `, ${failed.length} failed` : ''}.`,
         });
     }));
-    router.post('/api/tables/generate', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db/generate', (0, helpers_1.wrap)(async (req, res) => {
         const name = String(req.body?.name ?? '').trim();
         const columns = (req.body?.columns ?? []);
         if (!name)
@@ -144,6 +151,7 @@ function registerTableRoutes(router, ctx) {
         }
     }));
     const createTableHandler = (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const name = String(req.body?.name ?? '').trim();
         const columns = (req.body?.columns ?? []);
         if (!name)
@@ -162,9 +170,10 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to create table.');
         (0, helpers_1.ok)(res, { message: `Table "${name}" created.`, name }, 201);
     });
-    router.post('/api/tables', createTableHandler);
-    router.post('/api/tables/create', createTableHandler);
-    router.post('/api/tables/:table/columns', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db', createTableHandler);
+    router.post('/api/tables/:db/create', createTableHandler);
+    router.post('/api/tables/:db/:table/columns', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const col = req.body;
         if (!col?.name)
             return (0, helpers_1.fail)(res, 'Column name is required.');
@@ -173,7 +182,8 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to add column.');
         (0, helpers_1.ok)(res, { message: `Column "${col.name}" added.` }, 201);
     }));
-    router.put('/api/tables/:table/columns/:column', (0, helpers_1.wrap)(async (req, res) => {
+    router.put('/api/tables/:db/:table/columns/:column', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const col = req.body;
         if (!col)
             return (0, helpers_1.fail)(res, 'Column definition is required.');
@@ -182,7 +192,8 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to modify column.');
         (0, helpers_1.ok)(res, { message: `Column "${req.params.column}" updated.` });
     }));
-    router.post('/api/tables/:table/columns/:column/rename', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db/:table/columns/:column/rename', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const newName = String(req.body?.name ?? '').trim();
         if (!newName)
             return (0, helpers_1.fail)(res, 'New column name is required.');
@@ -191,13 +202,15 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to rename column.');
         (0, helpers_1.ok)(res, { message: `Column renamed to "${newName}".`, name: newName });
     }));
-    router.delete('/api/tables/:table/columns/:column', (0, helpers_1.wrap)(async (req, res) => {
+    router.delete('/api/tables/:db/:table/columns/:column', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const r = await db.dropColumn(req.params.table, req.params.column);
         if (!r.success)
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to drop column.');
         (0, helpers_1.ok)(res, { message: `Column "${req.params.column}" dropped.` });
     }));
-    router.post('/api/tables/:table/indexes', (0, helpers_1.wrap)(async (req, res) => {
+    router.post('/api/tables/:db/:table/indexes', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const def = req.body;
         if (!def || !Array.isArray(def.columns) || def.columns.length === 0) {
             return (0, helpers_1.fail)(res, 'At least one column is required for an index.');
@@ -207,7 +220,8 @@ function registerTableRoutes(router, ctx) {
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to create index.');
         (0, helpers_1.ok)(res, { message: 'Index created.' }, 201);
     }));
-    router.delete('/api/tables/:table/indexes/:index', (0, helpers_1.wrap)(async (req, res) => {
+    router.delete('/api/tables/:db/:table/indexes/:index', (0, helpers_1.wrap)(async (req, res) => {
+        const db = ctx.getDb(req);
         const r = await db.dropIndex(req.params.index);
         if (!r.success)
             return (0, helpers_1.fail)(res, r.error ?? 'Failed to drop index.');

package/dist/routes/databases.js

@@ -40,8 +40,10 @@ function registerDatabasesRoutes(router, ctx) {
     };
     router.get('/', async (_req, res, next) => {
         try {
+            res.locals.databasesMode = true;
             res.render('pages/databases', {
                 title: 'Databases',
+                databasesMode: true,
                 databases: await getDatabaseRows(manager),
                 dbDir: manager.directory,
                 readonly: Boolean(ctx.readonly),

package/dist/routes/pages.d.ts

@@ -1 +1 @@
-import type {Router} from 'express';import type {IDatabase} from '../db/index';import type {Logger} from '../utils/logger';interface PageContext{db:IDatabase;logger:Logger;}export declare function registerPages(router:Router,ctx:PageContext):void;export{};
+import type {Router,Request} from 'express';import type {IDatabase} from '../db/index';import type {Logger} from '../utils/logger';export interface PageContext{getDb:(req:Request)=>IDatabase;logger:Logger;}export declare function registerPages(router:Router,ctx:PageContext):void;

package/dist/routes/pages.js

@@ -6,7 +6,7 @@ const generator_1 = require("../sql/generator");
 const common_1 = require("../utils/common");
 const datatype_1 = require("../utils/datatype");
 const index_1 = require("../data/index");
-function buildDisplayRows(rawRows, info, table, basePath = '') {
+function buildDisplayRows(rawRows, info, dbId, table, basePath = '') {
     const pkCols = info.primaryKey.length ? info.primaryKey : ['_rowid_'];
     return rawRows.map((row) => {
         const pkEncoded = (0, common_1.encodePk)(pkCols.map((c) => row[c]));
@@ -49,8 +49,8 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
                         isAudio = mimeInfo.isAudio;
                         isVideo = mimeInfo.isVideo;
                         isPdf = mimeInfo.isPdf;
-                        if (table && pkEncoded) {
-                            blobUrl = `${basePath}/api/tables/${encodeURIComponent(table)}/row/${encodeURIComponent(pkEncoded)}/blob/${encodeURIComponent(c.name)}`;
+                        if (table && pkEncoded && dbId) {
+                            blobUrl = `${basePath}/api/tables/${encodeURIComponent(dbId)}/${encodeURIComponent(table)}/row/${encodeURIComponent(pkEncoded)}/blob/${encodeURIComponent(c.name)}`;
                         }
                     }
                     else if ((0, datatype_1.isJsonString)(v) || typeUpper.includes('JSON')) {
@@ -87,15 +87,32 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
         };
     });
 }
+function initPageLocals(res, db, dbId, allNames) {
+    const tables = allNames.filter((n) => !n.startsWith('_'));
+    const internalTables = allNames.filter((n) => n.startsWith('_'));
+    res.locals.dbId = dbId;
+    res.locals.dbPath = db.path;
+    res.locals.tables = tables;
+    res.locals.internalTables = internalTables;
+    res.locals.dialect = db.dialect;
+    res.locals.isPostgres = db.dialect === 'postgres';
+    res.locals.isSqlite = db.dialect === 'sqlite';
+    res.locals.dialectName = db.dialect === 'postgres' ? 'PostgreSQL' : 'SQLite';
+    res.locals.readonly = db.isReadOnly;
+    res.locals.databasesMode = false;
+    return { tables, internalTables };
+}
 function registerPages(router, ctx) {
-    const { db } = ctx;
     const notFound = (res, message) => {
         res.status(404).render('pages/error', { title: 'Not found', status: 404, error: message });
     };
-    router.get('/', async (_req, res, next) => {
+    router.get('/home/:db', async (req, res, next) => {
         try {
-            const names = res.locals.tables ?? [];
-            const internalNames = res.locals.internalTables ?? [];
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            const { tables: names, internalTables: internalNames } = initPageLocals(res, db, dbId, allNames);
             const colCountsMap = {};
             if (db.dialect === 'postgres') {
                 const colRes = await db.all(`SELECT table_name, count(*)::int AS cols FROM information_schema.columns WHERE table_schema = 'public' GROUP BY table_name;`);
@@ -131,6 +148,7 @@ function registerPages(router, ctx) {
             }
             res.render('pages/home', {
                 title: 'Home',
+                dbId,
                 tables: names,
                 counts,
                 cols,
@@ -144,9 +162,15 @@ function registerPages(router, ctx) {
             next(err);
         }
     });
-    router.get('/tables/:table', async (req, res, next) => {
+    router.get('/tables/:db/:table', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
             const table = req.params.table;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
             const info = await db.getTableInfo(table);
             if (!info.success || !info.data || info.data.columns.length === 0) {
                 return notFound(res, `Table "${table}" does not exist.`);
@@ -177,7 +201,7 @@ function registerPages(router, ctx) {
                     type: c.type,
                     active,
                     dir: active ? orderDir : null,
-                    href: `${basePath}/tables/${encodeURIComponent(table)}?${qs}${filterQS ? `&${filterQS}` : ''}`,
+                    href: `${basePath}/tables/${encodeURIComponent(dbId)}/${encodeURIComponent(table)}?${qs}${filterQS ? `&${filterQS}` : ''}`,
                 };
             });
             const refColumns = (refsR.data ?? [])
@@ -197,7 +221,7 @@ function registerPages(router, ctx) {
                 return [col.table, map];
             }));
             const countMap = new Map(countEntries);
-            const rows = buildDisplayRows(rawRows, info.data, table, basePath).map((dr, i) => {
+            const rows = buildDisplayRows(rawRows, info.data, dbId, table, basePath).map((dr, i) => {
                 const raw = rawRows[i];
                 const refs = refColumns.map((col) => {
                     const v = raw[col.to];
@@ -214,6 +238,7 @@ function registerPages(router, ctx) {
             res.locals.currentTable = table;
             res.render('pages/table', {
                 title: table,
+                dbId,
                 table,
                 info: info.data,
                 rows,
@@ -234,6 +259,7 @@ function registerPages(router, ctx) {
                 firstRow: count === 0 ? 0 : (page - 1) * pageSize + 1,
                 lastRow: Math.min(page * pageSize, count),
                 browseConfig: {
+                    dbId,
                     table,
                     filters,
                     pkCols: info.data.primaryKey.length ? info.data.primaryKey : ['_rowid_'],
@@ -246,9 +272,15 @@ function registerPages(router, ctx) {
             next(err);
         }
     });
-    router.get('/tables/:table/schema', async (req, res, next) => {
+    router.get('/schema/:db/:table', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
             const table = req.params.table;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
             const [info, schema] = await Promise.all([db.getTableInfo(table), db.getSchema(table)]);
             if (!info.success || !info.data || info.data.columns.length === 0) {
                 return notFound(res, `Table "${table}" does not exist.`);
@@ -259,26 +291,34 @@ function registerPages(router, ctx) {
             res.locals.currentTable = table;
             res.render('pages/schema', {
                 title: `Schema · ${table}`,
+                dbId,
                 table,
                 schema: schema.data,
                 isInternal: table.startsWith('_'),
                 dialect: db.dialect,
                 isSqlite: db.dialect === 'sqlite',
                 isPostgres: db.dialect === 'postgres',
-                config: { table, isInternal: table.startsWith('_'), dialect: db.dialect },
+                config: { dbId, table, isInternal: table.startsWith('_'), dialect: db.dialect },
             });
         }
         catch (err) {
             next(err);
         }
     });
-    router.get('/seed', async (req, res, next) => {
+    router.get('/seed/:db', async (req, res, next) => {
         try {
-            const tableNames = res.locals.tables ?? [];
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            const { tables: tableNames } = initPageLocals(res, db, dbId, allNames);
             if (tableNames.length === 0) {
                 return res.render('pages/seed-select', {
                     title: 'Seed Data Generator',
-                    tables: [],
+                    dbId,
+                    tables: tableNames,
+                    seedTables: [],
                     hasTables: false,
                     dialect: db.dialect,
                 });
@@ -299,7 +339,9 @@ function registerPages(router, ctx) {
             const defaultMode = req.query.mode === 'chain' ? 'chain' : 'single';
             res.render('pages/seed-select', {
                 title: 'Seed Data Generator · Choose Table & Mode',
-                tables: tableStats,
+                dbId,
+                tables: tableNames,
+                seedTables: tableStats,
                 hasTables: true,
                 defaultTable,
                 defaultMode,
@@ -310,16 +352,15 @@ function registerPages(router, ctx) {
             next(err);
         }
     });
-    router.get('/tables/:table/seed', (req, res) => {
-        const table = req.params.table;
-        const qs = req.url.includes('?') ? req.url.slice(req.url.indexOf('?')) : '';
-        const bp = res.locals.basePath || '';
-        return res.redirect(301, `${bp}/seed/${encodeURIComponent(table)}${qs}`);
-    });
-    router.get('/seed/:table', async (req, res, next) => {
+    router.get('/seed/:db/:table', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
             const table = req.params.table;
-            const allTables = res.locals.tables ?? [];
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            const { tables: allTables } = initPageLocals(res, db, dbId, allNames);
             const initialMode = req.query.mode === 'chain' ? 'chain' : 'single';
             const [info, countRes] = await Promise.all([db.getTableInfo(table), db.getRowCount(table)]);
             if (!info.success || !info.data || info.data.columns.length === 0) {
@@ -330,6 +371,7 @@ function registerPages(router, ctx) {
             res.locals.currentTable = table;
             res.render('pages/seed', {
                 title: `Seed data · ${table}`,
+                dbId,
                 table,
                 allTables,
                 mode: initialMode,
@@ -338,16 +380,22 @@ function registerPages(router, ctx) {
                 colCount: info.data.columns.length,
                 maxRows: index_1.MAX_SEED_ROWS,
                 quickCounts: [10, 50, 100, 500, 1000, index_1.MAX_SEED_ROWS],
-                seedConfig: { table, columns, rowCount, maxRows: index_1.MAX_SEED_ROWS, mode: initialMode },
+                seedConfig: { dbId, table, columns, rowCount, maxRows: index_1.MAX_SEED_ROWS, mode: initialMode },
             });
         }
         catch (err) {
             next(err);
         }
     });
-    router.get('/tables/:table/rows/new', async (req, res, next) => {
+    router.get('/tables/:db/:table/rows/new', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
             const table = req.params.table;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
             const info = await db.getTableInfo(table);
             if (!info.success || !info.data || info.data.columns.length === 0) {
                 return notFound(res, `Table "${table}" does not exist.`);
@@ -356,21 +404,28 @@ function registerPages(router, ctx) {
             res.locals.currentTable = table;
             res.render('pages/form', {
                 title: `New row · ${table}`,
+                dbId,
                 table,
                 mode: 'insert',
                 pk: null,
                 pkColumns,
                 infoSummary: `${info.data.columns.length} column(s)` + (pkColumns.length ? ` · PK: ${pkColumns.join(', ')}` : ''),
-                config: { table, mode: 'insert', pk: null, pkColumns },
+                config: { dbId, table, mode: 'insert', pk: null, pkColumns },
             });
         }
         catch (err) {
             next(err);
         }
     });
-    router.get('/tables/:table/rows/:id/edit', async (req, res, next) => {
+    router.get('/tables/:db/:table/rows/:id/edit', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
             const table = req.params.table;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
             const info = await db.getTableInfo(table);
             if (!info.success || !info.data || info.data.columns.length === 0) {
                 return notFound(res, `Table "${table}" does not exist.`);
@@ -383,57 +438,96 @@ function registerPages(router, ctx) {
             res.locals.currentTable = table;
             res.render('pages/form', {
                 title: `Edit row · ${table}`,
+                dbId,
                 table,
                 mode: 'edit',
                 pk: req.params.id,
                 pkColumns,
                 infoSummary: `${info.data.columns.length} column(s)` + (info.data.primaryKey.length ? ` · PK: ${info.data.primaryKey.join(', ')}` : ''),
-                config: { table, mode: 'edit', pk: req.params.id, pkColumns },
+                config: { dbId, table, mode: 'edit', pk: req.params.id, pkColumns },
             });
         }
         catch (err) {
             next(err);
         }
     });
-    router.get('/erd', (_req, res) => {
-        res.render('pages/erd', { title: 'ER Diagram' });
+    router.get('/erd/:db', async (req, res, next) => {
+        try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
+            res.render('pages/erd', { title: 'ER Diagram', dbId });
+        }
+        catch (err) {
+            next(err);
+        }
     });
-    router.get('/designer', (_req, res) => {
-        res.render('pages/designer', {
-            title: 'New table',
-            dialect: db.dialect,
-            isSqlite: db.dialect === 'sqlite',
-            isPostgres: db.dialect === 'postgres',
-        });
+    router.get('/designer/:db', async (req, res, next) => {
+        try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
+            res.render('pages/designer', {
+                title: 'New table',
+                dbId,
+                dialect: db.dialect,
+                isSqlite: db.dialect === 'sqlite',
+                isPostgres: db.dialect === 'postgres',
+            });
+        }
+        catch (err) {
+            next(err);
+        }
     });
-    router.get('/query', async (_req, res, next) => {
+    router.get('/query/:db', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
             const queries = await db.listSavedQueries();
-            res.render('pages/query', { title: 'Query editor', savedQueries: queries.success ? queries.data : [] });
+            res.render('pages/query', { title: 'Query editor', dbId, savedQueries: queries.success ? queries.data : [] });
         }
         catch (err) {
             next(err);
         }
     });
-    router.get('/export', async (_req, res, next) => {
+    router.get('/export/:db', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
             const dump = await (0, export_1.generateSqlDump)(db);
             if (!dump.success || !dump.data)
                 throw new Error(dump.error ?? 'Failed to generate dump.');
             const stamp = new Date().toISOString().replace(/[:.]/g, '-');
             res.setHeader('Content-Type', 'application/sql; charset=utf-8');
-            res.setHeader('Content-Disposition', `attachment; filename="admindb-${stamp}.sql"`);
+            res.setHeader('Content-Disposition', `attachment; filename="${encodeURIComponent(dbId)}-${stamp}.sql"`);
             res.send(dump.data);
         }
         catch (err) {
             next(err);
         }
     });
-    router.get('/info', async (_req, res, next) => {
+    router.get('/info/:db', async (req, res, next) => {
         try {
+            const db = ctx.getDb(req);
+            const dbId = req.params.db;
+            res.locals.dbId = dbId;
+            const all = await db.listTables();
+            const allNames = (all.data ?? []).map((t) => t.name);
+            initPageLocals(res, db, dbId, allNames);
             const settingsRes = await db.getSettings();
             res.render('pages/info', {
                 title: 'Database Info',
+                dbId,
                 settings: settingsRes.success ? settingsRes.data : {},
                 dialect: db.dialect,
                 dbPath: db.path,

package/dist/serverless.js

@@ -19,30 +19,42 @@ function isServerlessEnvironment(env = process.env) {
         env.CF_PAGES);
 }
 function createServerlessHandler(options = {}) {
-    const rawTarget = options.connection || options.dbPath || '';
+    const envTarget = process.env.ADMINDB_CONNECTION ||
+        process.env.DATABASE_URL ||
+        process.env.POSTGRES_URL ||
+        process.env.PG_CONNECTION ||
+        '';
+    const rawTarget = options.connection || options.dbPath || ((0, common_1.isPostgresConnectionString)(envTarget) ? envTarget : '');
     const isPg = Boolean(options.pgOptions) ||
         (0, common_1.isPostgresConnectionString)(rawTarget) ||
         options.db?.dialect === 'postgres';
     const defaultReadonly = !isPg;
     const app = (0, app_1.createRouter)({
         ...options,
+        connection: options.connection || ((0, common_1.isPostgresConnectionString)(rawTarget) ? rawTarget : undefined),
         serverless: options.serverless ?? true,
-        readonly: options.readonly ?? defaultReadonly,
+        readonly: options.readonly !== undefined ? Boolean(options.readonly) : defaultReadonly,
     });
     return (req, res) => {
         app(req, res);
     };
 }
 function createLambdaHandler(options = {}) {
-    const rawTarget = options.connection || options.dbPath || '';
+    const envTarget = process.env.ADMINDB_CONNECTION ||
+        process.env.DATABASE_URL ||
+        process.env.POSTGRES_URL ||
+        process.env.PG_CONNECTION ||
+        '';
+    const rawTarget = options.connection || options.dbPath || ((0, common_1.isPostgresConnectionString)(envTarget) ? envTarget : '');
     const isPg = Boolean(options.pgOptions) ||
         (0, common_1.isPostgresConnectionString)(rawTarget) ||
         options.db?.dialect === 'postgres';
     const defaultReadonly = !isPg;
     const app = (0, app_1.createRouter)({
         ...options,
+        connection: options.connection || ((0, common_1.isPostgresConnectionString)(rawTarget) ? rawTarget : undefined),
         serverless: options.serverless ?? true,
-        readonly: options.readonly ?? defaultReadonly,
+        readonly: options.readonly !== undefined ? Boolean(options.readonly) : defaultReadonly,
     });
     return async (event, _context) => {
         return new Promise((resolve) => {