@zyno-io/dk-server-foundation 26.412.2137 → 26.509.2227

package/dist/src/database/schema/grammar/PostgresGrammar.js

@@ -0,0 +1,223 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PostgresGrammar = void 0;
+function __assignType(fn, args) {
+    fn.__type = args;
+    return fn;
+}
+/*@ts-ignore*/
+var { __ΩDialect } = require('../../dialect');
+const dialect_1 = require("../../dialect");
+/*@ts-ignore*/
+var { __ΩTableSchema, __ΩIndexSchema, __ΩForeignKeySchema, __ΩColumnSchema } = require('../../migration/create/schema-model');
+const Grammar_1 = require("./Grammar");
+class PostgresGrammar extends Grammar_1.Grammar {
+    constructor() {
+        super(...arguments);
+        this.dialect = 'postgres';
+    }
+    quote(name) {
+        return (0, dialect_1.quoteId)('postgres', name);
+    }
+    qualifiedTable(name) {
+        if (this.pgSchema && this.pgSchema !== 'public') {
+            return `${this.quote(this.pgSchema)}.${this.quote(name)}`;
+        }
+        return this.quote(name);
+    }
+    qualifiedType(typeName) {
+        if (this.pgSchema && this.pgSchema !== 'public') {
+            return `${this.quote(this.pgSchema)}.${this.quote(typeName)}`;
+        }
+        return this.quote(typeName);
+    }
+    createTable(table) {
+        const lines = [];
+        const pkCols = table.columns.filter(__assignType(c => c.isPrimaryKey, ['c', '', 'P"2!"/"'])).map(__assignType(c => c.name, ['c', '', 'P"2!"/"']));
+        for (const col of table.columns) {
+            lines.push(`    ${this.columnDef(col)}`);
+        }
+        if (pkCols.length > 0) {
+            const quoted = pkCols.map(__assignType(c => this.quote(c), ['c', '', 'P"2!"/"'])).join(', ');
+            lines.push(`    PRIMARY KEY (${quoted})`);
+        }
+        return `CREATE TABLE ${this.qualifiedTable(table.name)} (\n${lines.join(',\n')}\n)`;
+    }
+    createIndex(tableName, idx) {
+        const unique = idx.unique ? 'UNIQUE ' : '';
+        // PG has no SPATIAL prefix; spatial flag is silently ignored
+        const cols = idx.columns.map(__assignType(c => this.quote(c), ['c', '', 'P"2!"/"'])).join(', ');
+        return `CREATE ${unique}INDEX ${this.quote(idx.name)} ON ${this.qualifiedTable(tableName)} (${cols})`;
+    }
+    addForeignKey(tableName, fk) {
+        const cols = fk.columns.map(__assignType(c => this.quote(c), ['c', '', 'P"2!"/"'])).join(', ');
+        const refCols = fk.referencedColumns.map(__assignType(c => this.quote(c), ['c', '', 'P"2!"/"'])).join(', ');
+        const onDelete = (0, Grammar_1.validateFkAction)(fk.onDelete, this.dialect);
+        const onUpdate = (0, Grammar_1.validateFkAction)(fk.onUpdate, this.dialect);
+        return (`ALTER TABLE ${this.qualifiedTable(tableName)} ADD CONSTRAINT ${this.quote(fk.name)} ` +
+            `FOREIGN KEY (${cols}) REFERENCES ${this.qualifiedTable(fk.referencedTable)} (${refCols}) ` +
+            `ON DELETE ${onDelete} ON UPDATE ${onUpdate}`);
+    }
+    createEnumType(typeName, values) {
+        const qualifiedName = this.qualifiedType(typeName);
+        const vals = values.map(__assignType(v => `'${(0, Grammar_1.escapeStr)(v)}'`, ['v', '', 'P"2!"/"'])).join(', ');
+        const schemaFilter = this.pgSchema && this.pgSchema !== 'public'
+            ? ` AND typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${(0, Grammar_1.escapeStr)(this.pgSchema)}')`
+            : '';
+        return [
+            [
+                `DO $$ BEGIN`,
+                `IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = '${(0, Grammar_1.escapeStr)(typeName)}'${schemaFilter}) THEN`,
+                `    CREATE TYPE ${qualifiedName} AS ENUM (${vals});`,
+                `END IF;`,
+                `END $$`
+            ].join('\n'),
+            `CREATE CAST (text AS ${qualifiedName}) WITH INOUT AS IMPLICIT`
+        ];
+    }
+    dropTable(name) {
+        return `DROP TABLE ${this.qualifiedTable(name)}`;
+    }
+    dropTableIfExists(name) {
+        return `DROP TABLE IF EXISTS ${this.qualifiedTable(name)}`;
+    }
+    renameTable(from, to) {
+        return `ALTER TABLE ${this.qualifiedTable(from)} RENAME TO ${this.quote(to)}`;
+    }
+    addColumn(tableName, col) {
+        return `ALTER TABLE ${this.qualifiedTable(tableName)} ADD COLUMN ${this.columnDef(col)}`;
+    }
+    dropColumn(tableName, columnName) {
+        return `ALTER TABLE ${this.qualifiedTable(tableName)} DROP COLUMN ${this.quote(columnName)}`;
+    }
+    modifyColumn(tableName, col) {
+        const stmts = [];
+        const tbl = this.qualifiedTable(tableName);
+        const c = this.quote(col.name);
+        const typeDef = col.autoIncrement ? (col.type === 'bigint' ? 'BIGINT' : 'INTEGER') : this.typeDef(col);
+        stmts.push(`ALTER TABLE ${tbl} ALTER COLUMN ${c} TYPE ${typeDef}`);
+        stmts.push(`ALTER TABLE ${tbl} ALTER COLUMN ${c} ${col.nullable ? 'DROP NOT NULL' : 'SET NOT NULL'}`);
+        if (col.defaultExpression) {
+            stmts.push(`ALTER TABLE ${tbl} ALTER COLUMN ${c} SET DEFAULT ${col.defaultExpression}`);
+        }
+        else if (col.defaultValue !== undefined) {
+            stmts.push(`ALTER TABLE ${tbl} ALTER COLUMN ${c} SET DEFAULT ${renderPgDefault(col)}`);
+        }
+        else {
+            stmts.push(`ALTER TABLE ${tbl} ALTER COLUMN ${c} DROP DEFAULT`);
+        }
+        return stmts;
+    }
+    renameColumn(tableName, from, to) {
+        return `ALTER TABLE ${this.qualifiedTable(tableName)} RENAME COLUMN ${this.quote(from)} TO ${this.quote(to)}`;
+    }
+    dropIndex(tableName, indexName) {
+        // Index names in PG are schema-qualified, not table-qualified
+        if (this.pgSchema && this.pgSchema !== 'public') {
+            return `DROP INDEX ${this.quote(this.pgSchema)}.${this.quote(indexName)}`;
+        }
+        return `DROP INDEX ${this.quote(indexName)}`;
+    }
+    dropForeignKey(tableName, constraintName) {
+        return `ALTER TABLE ${this.qualifiedTable(tableName)} DROP CONSTRAINT ${this.quote(constraintName)}`;
+    }
+    addPrimaryKey(tableName, columns) {
+        const cols = columns.map(__assignType(c => this.quote(c), ['c', '', 'P"2!"/"'])).join(', ');
+        return `ALTER TABLE ${this.qualifiedTable(tableName)} ADD PRIMARY KEY (${cols})`;
+    }
+    dropPrimaryKey(tableName, constraintName) {
+        const name = constraintName ?? `${tableName}_pkey`;
+        return `ALTER TABLE ${this.qualifiedTable(tableName)} DROP CONSTRAINT ${this.quote(name)}`;
+    }
+    columnType(col) {
+        return this.typeDef(col);
+    }
+    columnDef(col) {
+        let typeDef;
+        if (col.autoIncrement) {
+            typeDef = col.type === 'bigint' ? 'BIGSERIAL' : 'SERIAL';
+        }
+        else {
+            typeDef = this.typeDef(col);
+        }
+        let def = `${this.quote(col.name)} ${typeDef}`;
+        if (!col.nullable && !col.autoIncrement)
+            def += ' NOT NULL';
+        if (!col.autoIncrement) {
+            if (col.defaultExpression) {
+                def += ` DEFAULT ${col.defaultExpression}`;
+            }
+            else if (col.defaultValue !== undefined) {
+                def += ` DEFAULT ${renderPgDefault(col)}`;
+            }
+        }
+        return def;
+    }
+    typeDef(col) {
+        switch (col.type) {
+            case 'varchar':
+                return col.size ? `VARCHAR(${col.size})` : 'VARCHAR';
+            case 'char':
+                return `CHAR(${col.size || 1})`;
+            case 'smallint':
+                return 'SMALLINT';
+            case 'int':
+            case 'integer':
+                return 'INTEGER';
+            case 'bigint':
+                return 'BIGINT';
+            case 'real':
+            case 'float':
+                return 'REAL';
+            case 'double precision':
+            case 'double':
+                return 'DOUBLE PRECISION';
+            case 'decimal':
+            case 'numeric':
+                if (col.size === undefined)
+                    return 'NUMERIC';
+                return col.scale !== undefined ? `NUMERIC(${col.size},${col.scale})` : `NUMERIC(${col.size})`;
+            case 'boolean':
+                return 'BOOLEAN';
+            case 'date':
+                return 'DATE';
+            case 'timestamp':
+                return 'TIMESTAMP';
+            case 'timestamptz':
+                return 'TIMESTAMPTZ';
+            case 'text':
+                return 'TEXT';
+            case 'bytea':
+                return 'BYTEA';
+            case 'json':
+                return 'JSON';
+            case 'jsonb':
+                return 'JSONB';
+            case 'uuid':
+                return 'UUID';
+            case 'enum':
+                return col.enumTypeName ? this.qualifiedType(col.enumTypeName) : 'TEXT';
+            default:
+                return col.type.toUpperCase();
+        }
+    }
+}
+exports.PostgresGrammar = PostgresGrammar;
+PostgresGrammar.__type = [() => Grammar_1.Grammar, () => __ΩDialect, 'dialect', function () { return 'postgres'; }, 'name', 'quote', 'qualifiedTable', 'typeName', 'qualifiedType', () => __ΩTableSchema, 'table', 'createTable', 'tableName', () => __ΩIndexSchema, 'idx', 'createIndex', () => __ΩForeignKeySchema, 'fk', 'addForeignKey', 'values', 'createEnumType', 'dropTable', 'dropTableIfExists', 'from', 'to', 'renameTable', () => __ΩColumnSchema, 'col', 'addColumn', 'columnName', 'dropColumn', () => __ΩColumnSchema, 'modifyColumn', 'renameColumn', 'indexName', 'dropIndex', 'constraintName', 'dropForeignKey', 'columns', 'addPrimaryKey', 'dropPrimaryKey', () => __ΩColumnSchema, 'columnType', () => __ΩColumnSchema, 'columnDef', () => __ΩColumnSchema, 'typeDef', 'PostgresGrammar', 'P7!n"3#9>$P&2%&0&P&2%&0\'P&2(&0)Pn*2+&0,P&2-n.2/&00P&2-n122&03P&2(&F24&F05P&2%&06P&2%&07P&28&29&0:P&2-n;2<&0=P&2-&2>&0?P&2-n@2<&F0AP&2-&28&29&0BP&2-&2C&0DP&2-&2E&0FP&2-&F2G&0HP&2-&2E8&0IPnJ2<&0KPnL2<&0MPnN2<&0O;5wP'];
+const PG_NUMERIC_TYPES = new Set(['smallint', 'int', 'integer', 'bigint', 'real', 'float', 'double', 'double precision', 'decimal', 'numeric']);
+function renderPgDefault(col) {
+    const v = col.defaultValue;
+    if (v === null)
+        return 'NULL';
+    if (typeof v === 'boolean')
+        return v ? 'TRUE' : 'FALSE';
+    if (col.type === 'boolean') {
+        const s = String(v).toLowerCase();
+        return s === 'true' || s === '1' ? 'TRUE' : 'FALSE';
+    }
+    if (typeof v === 'number' || PG_NUMERIC_TYPES.has(col.type))
+        return String(v);
+    return `'${(0, Grammar_1.escapeStr)(String(v))}'`;
+}
+renderPgDefault.__type = [() => __ΩColumnSchema, 'col', 'renderPgDefault', 'Pn!2"&/#'];
+//# sourceMappingURL=PostgresGrammar.js.map

package/dist/src/database/schema/grammar/PostgresGrammar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgresGrammar.js","sourceRoot":"","sources":["../../../../../src/database/schema/grammar/PostgresGrammar.ts"],"names":[],"mappings":"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"}

package/dist/src/database/schema/index.d.ts

@@ -0,0 +1,9 @@
+export * from './AlterBlueprint';
+export * from './Blueprint';
+export * from './BlueprintBase';
+export * from './ColumnDefinition';
+export * from './Schema';
+export * from './grammar/Grammar';
+export * from './grammar/MySQLGrammar';
+export * from './grammar/PostgresGrammar';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/database/schema/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/database/schema/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}

package/dist/src/database/schema/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./AlterBlueprint"), exports);
+tslib_1.__exportStar(require("./Blueprint"), exports);
+tslib_1.__exportStar(require("./BlueprintBase"), exports);
+tslib_1.__exportStar(require("./ColumnDefinition"), exports);
+tslib_1.__exportStar(require("./Schema"), exports);
+tslib_1.__exportStar(require("./grammar/Grammar"), exports);
+tslib_1.__exportStar(require("./grammar/MySQLGrammar"), exports);
+tslib_1.__exportStar(require("./grammar/PostgresGrammar"), exports);
+//# sourceMappingURL=index.js.map

package/dist/src/database/schema/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/database/schema/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,sDAA4B;AAC5B,0DAAgC;AAChC,6DAAmC;AACnC,mDAAyB;AACzB,4DAAkC;AAClC,iEAAuC;AACvC,oEAA0C"}

package/docs/content/cli.md

@@ -68,6 +68,9 @@ node app.js migration:create
 
 # Non-interactive (CI-safe)
 node app.js migration:create --non-interactive
+
+# Emit dialect-specific raw SQL instead of dialect-portable schema-builder calls
+node app.js migration:create --raw
 ```
 
 Behavior:
@@ -76,7 +79,7 @@ Behavior:
 2. Introspects the live database schema via `information_schema`
 3. Compares the two and detects added/removed/modified tables, columns, indexes, foreign keys, primary key changes, and PostgreSQL enum types
 4. In interactive mode, prompts to detect column renames (avoiding data loss from drop+add)
-5. Generates dialect-specific DDL (MySQL or PostgreSQL)
+5. **By default, emits dialect-portable `db.schema.create/alter` calls** so the generated migration runs on either MySQL or PostgreSQL. Pass `--raw` to fall back to the legacy dialect-specific SQL emitter.
 6. Writes a timestamped migration file using `createMigration()` format
 
 **Non-interactive mode**: Column renames cannot be detected without user input. Ambiguous changes (columns simultaneously added and removed on the same table) are treated as separate DROP/ADD operations, which may cause data loss. A warning is printed when this occurs.

package/docs/content/configuration.md

@@ -22,6 +22,12 @@ Properties ending in `_SECRET` are treated as secrets by the config loader.
 | `APP_ENV` | `string` | —       | Application environment (`development`, `production`, etc.) |
 | `PORT`    | `number` | `3000`  | HTTP server port                                            |
 
+### Database Selection
+
+| Variable     | Type                       | Default | Description                                                                                |
+| ------------ | -------------------------- | ------- | ------------------------------------------------------------------------------------------ |
+| `DB_ADAPTER` | `'mysql'` \| `'postgres'`  | —       | Selects the database dialect when using `createDatabase(sharedConfig)` (see [Database](./database.md)). |
+
 ### MySQL Database
 
 | Variable                     | Type     | Default             | Description              |

package/docs/content/database.md

@@ -29,6 +29,25 @@ const app = createApp({
 
 All other MySQL connection options are configured via environment variables (see [Configuration](./configuration.md)).
 
+### Choosing the dialect at runtime — `createDatabase()`
+
+For dialect-agnostic apps, use `createDatabase()` to select MySQL or PostgreSQL via configuration instead of importing one factory or the other.
+
+```typescript
+import { createDatabase } from '@zyno-io/dk-server-foundation';
+
+// Reads DB_ADAPTER ('mysql' or 'postgres') from the environment at module load
+class AppDB extends createDatabase({ enableLocksTable: true }, [User, Post, Comment]) {}
+
+// Or be explicit (each form keeps its dialect-specific pool config)
+class AppDB extends createDatabase('mysql', { connectionLimit: 20, enableLocksTable: true }, [User]) {}
+class AppDB extends createDatabase('postgres', { max: 20, enableLocksTable: true }, [User]) {}
+```
+
+The shared form only accepts `enableLocksTable`; pool tuning is done via the `MYSQL_*` / `PG_*` env vars. The shared form requires `DB_ADAPTER` to be set and throws at call time if it isn't — use the explicit form when you don't want that dependency.
+
+Both forms delegate to `createMySQLDatabase` or `createPostgresDatabase` and return the same kind of class — a subclass of `BaseDatabase`. The existing single-dialect factories remain available.
+
 ## Entity Creation
 
 Type-safe entity creation with automatic inference of optional fields (auto-increment, nullable, or `HasDefault`).
@@ -340,6 +359,115 @@ class User {
 }
 ```
 
+## Schema Builder (multi-dialect)
+
+`db.schema` is a Laravel-style fluent schema builder that emits dialect-appropriate SQL at runtime, so a single migration file works on both MySQL and PostgreSQL.
+
+```typescript
+export default createMigration(async db => {
+    await db.schema.create('users', t => {
+        t.id();
+        t.string('email', 255).notNull().unique();
+        t.string('name', 255).nullable();
+        t.boolean('active').notNull().default(false);
+        t.json('metadata').nullable();
+        t.enum('status', ['active', 'pending']).notNull().default('pending');
+        t.dateTime('createdAt').notNull().defaultRaw('CURRENT_TIMESTAMP');
+        t.dateTime('updatedAt').notNull().defaultRaw('CURRENT_TIMESTAMP').onUpdate('CURRENT_TIMESTAMP');
+    });
+
+    await db.schema.create('posts', t => {
+        t.id();
+        t.bigInteger('userId').unsigned().notNull();
+        t.string('title', 200).notNull();
+        t.text('body').nullable();
+        t.foreign('userId').references('id').on('users').onDelete('cascade');
+        t.index('userId');
+    });
+
+    // Escape hatches
+    await db.schema.raw(`UPDATE users SET active = TRUE WHERE id < 100`);
+    await db.schema.onlyOn('postgres', () => db.rawExecute(`CREATE EXTENSION IF NOT EXISTS pg_trgm`));
+});
+```
+
+### Column types
+
+| Method | MySQL | Postgres |
+| ------ | ----- | -------- |
+| `id(name='id')` | `BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY` | `BIGSERIAL PRIMARY KEY` |
+| `string(name, len=255)` | `VARCHAR(len)` | `VARCHAR(len)` |
+| `char(name, len=1)` | `CHAR(len)` | `CHAR(len)` |
+| `text(name)` | `TEXT` | `TEXT` |
+| `tinyint`, `smallint`, `integer`, `bigInteger` | `TINYINT`, `SMALLINT`, `INT`, `BIGINT` | `SMALLINT`, `INTEGER`, `BIGINT` (`tinyint` → `SMALLINT`) |
+| `boolean(name)` | `TINYINT(1)` | `BOOLEAN` |
+| `float`, `double`, `decimal(name, p?, s?)` | `FLOAT`, `DOUBLE`, `DECIMAL(p,s)` | `REAL`, `DOUBLE PRECISION`, `NUMERIC(p,s)` |
+| `date(name)` | `DATE` | `DATE` |
+| `dateTime(name)` | `DATETIME` | `TIMESTAMP` |
+| `timestamp(name)` | `TIMESTAMP` | `TIMESTAMP` |
+| `timestamptz(name)` | `TIMESTAMP` | `TIMESTAMPTZ` |
+| `binary(name, len=16)` | `BINARY(len)` | `BYTEA` |
+| `blob(name)` | `BLOB` | `BYTEA` |
+| `json(name)` | `JSON` | `JSON` |
+| `jsonb(name)` | `JSON` | `JSONB` |
+| `uuid(name)` | `BINARY(16)` (canonical) | `UUID` |
+| `uuidString(name)` | `CHAR(36)` | `CHAR(36)` |
+| `enum(name, values, typeName?)` | `ENUM(...)` inline | `CREATE TYPE` (deduped) + qualified ref |
+| `point(name)` | `POINT` | **throws** (MySQL-only) |
+
+### Modifiers
+
+`.nullable()`, `.notNull()`, `.default(value)`, `.defaultRaw(expression)`, `.unsigned()` (MySQL-only, ignored on PG), `.onUpdate(expression)` (MySQL-only), `.autoIncrement()`, `.primary()`, `.unique(name?)`, `.index(name?)`, `.references(col).on(table).onDelete(action).onUpdate(action)`.
+
+### Table-level
+
+`.timestamps()` (createdAt + updatedAt with `CURRENT_TIMESTAMP`), `.primary([cols])` (composite PK), `.index(cols, name?)`, `.unique(cols, name?)`, `.spatialIndex(cols, name?)` (MySQL POINT), `.foreign(cols, name?).references(...).on(...)`.
+
+### Schema operations
+
+`db.schema.create(name, fn)`, `db.schema.alter(name, fn)`, `db.schema.drop(name)`, `db.schema.dropIfExists(name)`, `db.schema.rename(from, to)`, `db.schema.enumType(name, values)` (PG explicit type), `db.schema.raw(sql)`, `db.schema.onlyOn(dialect, fn)`.
+
+### Introspection (for idempotent migrations)
+
+```typescript
+if (!(await db.schema.hasTable('users'))) { /* ... */ }
+if (await db.schema.hasColumn('users', 'phone')) { /* ... */ }
+if (await db.schema.hasIndex('users', 'users_email_unique')) { /* ... */ }
+```
+
+### Altering tables — `db.schema.alter()`
+
+```typescript
+await db.schema.alter('users', t => {
+    // Add columns (same syntax as create)
+    t.string('phone', 20).nullable();
+    t.boolean('archived').notNull().default(false);
+
+    // Modify an existing column (Laravel-style .change() suffix)
+    t.string('email', 500).notNull().change();
+
+    // Drop / rename columns
+    t.dropColumn('legacyField');
+    t.renameColumn('old_name', 'new_name');
+
+    // Indexes & foreign keys
+    t.index('phone');
+    t.dropUnique('users_email_unique');
+    t.foreign('orgId').references('id').on('orgs').onDelete('cascade');
+    t.dropForeign('users_old_fk');
+
+    // Primary key
+    t.dropPrimary();
+    t.primary(['a', 'b']);
+});
+```
+
+Operations execute in dependency-safe order: drop FKs → drop indexes → drop PK → drop columns → rename columns → PG enum type prep → add columns → modify columns → add PK → add indexes → defer added FKs to flush. Added FKs are deferred (same as `create()`) so cross-table refs resolve.
+
+### How FK ordering works
+
+Inline FKs declared via `t.foreign(...)` are deferred and emitted as `ALTER TABLE ... ADD CONSTRAINT` after all `CREATE TABLE`s in the migration complete. The migration runner calls `db.schema.flush()` automatically; you can also call it manually if you need FKs applied mid-migration. PG enum types are deduplicated per-migration via the `enumTypeName` (so the same shared enum across two tables emits only one `CREATE TYPE` + `CREATE CAST`).
+
 ## Migrations
 
 ### Generating Migrations

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zyno-io/dk-server-foundation",
-    "version": "26.412.2137",
+    "version": "26.509.2227",
     "description": "TypeScript server foundation built on the Deepkit framework",
     "homepage": "https://github.com/zyno-io/dk-server-foundation#readme",
     "bugs": {

package/src/app/config.ts

@@ -7,6 +7,8 @@ export class BaseAppConfig {
 
     PORT?: number;
 
+    DB_ADAPTER?: 'mysql' | 'postgres';
+
     MYSQL_HOST?: string;
     MYSQL_PORT?: number;
     MYSQL_USER?: string;

package/src/database/common.ts

@@ -32,6 +32,34 @@ DatabaseSession.prototype.addPostCommitHook = function (hook: () => Promise<void
     this[PostCommitHooksSymbol]!.push(hook);
 };
 
+type LocksAdapterState = SQLDatabaseAdapter & { _enableLocksTable?: boolean; _locksTableInit?: Promise<void> };
+
+async function ensureMysqlLocksTable(adapter: SQLDatabaseAdapter): Promise<void> {
+    const a = adapter as LocksAdapterState;
+    if (!a._enableLocksTable) return; // creator opted out
+    if (a._locksTableInit) {
+        await a._locksTableInit;
+        return;
+    }
+    a._locksTableInit = (async () => {
+        const conn = await adapter.connectionPool.getConnection();
+        try {
+            await conn.run(
+                `CREATE TABLE IF NOT EXISTS \`_locks\` (
+                    \`key\` VARCHAR(255) NOT NULL PRIMARY KEY,
+                    \`createdAt\` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                    \`lastTouched\` DATETIME
+                )`,
+                []
+            );
+            await conn.run(`DELETE FROM _locks WHERE lastTouched < NOW() - INTERVAL 1 HOUR`, []);
+        } finally {
+            conn.release();
+        }
+    })();
+    await a._locksTableInit;
+}
+
 DatabaseSession.prototype.acquireSessionLock = async function (key: MutexKey | MutexKey[]) {
     const flattenedKey = flattenMutexKey(key);
     const adapter = this.adapter as SQLDatabaseAdapter;
@@ -47,6 +75,10 @@ DatabaseSession.prototype.acquireSessionLock = async function (key: MutexKey | M
         // then we can use an in-transaction row level update so that a row-level lock is acquired
         // this will be automatically released when the transaction is committed or rolled back
 
+        // Lazy-initialize the _locks table on first use (gated by createMySQLDatabase's enableLocksTable flag).
+        // This avoids a constructor-time fire-and-forget that would race with pool teardown for fast CLIs.
+        await ensureMysqlLocksTable(adapter);
+
         // insert the lock row outside the transaction on a separate connection
         const insertConn = await adapter.connectionPool.getConnection();
         try {
@@ -84,6 +116,25 @@ export class BaseDatabase<A extends DatabaseAdapter = DatabaseAdapter> extends D
     // override existing definition
     declare query: <T extends OrmEntity>(type?: QueryClassType<T>, txn?: DatabaseSession<DatabaseAdapter>) => SQLDatabaseQuery<T>;
 
+    private _schema?: import('./schema').Schema;
+
+    /** Multi-dialect schema builder. See src/database/schema/. */
+    get schema(): import('./schema').Schema {
+        if (!this._schema) {
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            const { Schema, MySQLGrammar, PostgresGrammar } = require('./schema') as typeof import('./schema');
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            const { getDialect } = require('./dialect') as typeof import('./dialect');
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            const { getAppConfig } = require('../app/resolver') as typeof import('../app/resolver');
+            const dialect = getDialect(this.adapter as unknown as import('@deepkit/sql').SQLDatabaseAdapter);
+            const pgSchema = dialect === 'postgres' ? (getAppConfig().PG_SCHEMA ?? 'public') : 'public';
+            const grammar = dialect === 'postgres' ? new PostgresGrammar(pgSchema) : new MySQLGrammar(pgSchema);
+            this._schema = new Schema(this, grammar);
+        }
+        return this._schema;
+    }
+
     async transaction<T>(callback: (session: DatabaseSession<A>) => Promise<T>): Promise<T> {
         let session_: DatabaseSession<DatabaseAdapter> | undefined;
         const result = await super.transaction(async session => {

package/src/database/factory.ts

@@ -0,0 +1,59 @@
+import { ClassType } from '@deepkit/core';
+import { Database } from '@deepkit/orm';
+
+import { BaseDatabase } from './common';
+import { Dialect } from './dialect';
+import { createMySQLDatabase, IMySQLDatabaseAdapterConfig, MySQLDatabaseAdapter } from './mysql';
+import { createPostgresDatabase, IPostgresDatabaseAdapterConfig, PostgresDatabaseAdapter } from './postgres';
+
+export type AnyDatabaseAdapter = MySQLDatabaseAdapter | PostgresDatabaseAdapter;
+
+export interface ICommonDatabaseAdapterConfig {
+    enableLocksTable?: boolean;
+}
+
+type Entities = ConstructorParameters<typeof Database>[1];
+
+export function createDatabase(config: ICommonDatabaseAdapterConfig, entities?: Entities): ClassType<BaseDatabase<AnyDatabaseAdapter>>;
+export function createDatabase(
+    dialect: 'mysql',
+    config: IMySQLDatabaseAdapterConfig,
+    entities?: Entities
+): ClassType<BaseDatabase<MySQLDatabaseAdapter>>;
+export function createDatabase(
+    dialect: 'postgres',
+    config: IPostgresDatabaseAdapterConfig,
+    entities?: Entities
+): ClassType<BaseDatabase<PostgresDatabaseAdapter>>;
+export function createDatabase(
+    dialectOrConfig: Dialect | ICommonDatabaseAdapterConfig,
+    configOrEntities?: IMySQLDatabaseAdapterConfig | IPostgresDatabaseAdapterConfig | Entities,
+    maybeEntities?: Entities
+): ClassType<BaseDatabase<AnyDatabaseAdapter>> {
+    let dialect: Dialect;
+    let config: IMySQLDatabaseAdapterConfig | IPostgresDatabaseAdapterConfig;
+    let entities: Entities;
+
+    if (typeof dialectOrConfig === 'string') {
+        dialect = dialectOrConfig;
+        config = configOrEntities as IMySQLDatabaseAdapterConfig | IPostgresDatabaseAdapterConfig;
+        entities = maybeEntities ?? [];
+    } else {
+        dialect = resolveDialectFromEnv();
+        config = dialectOrConfig;
+        entities = (configOrEntities as Entities | undefined) ?? [];
+    }
+
+    return dialect === 'postgres'
+        ? createPostgresDatabase(config as IPostgresDatabaseAdapterConfig, entities)
+        : createMySQLDatabase(config as IMySQLDatabaseAdapterConfig, entities);
+}
+
+function resolveDialectFromEnv(): Dialect {
+    const value = process.env.DB_ADAPTER;
+    if (value === 'mysql' || value === 'postgres') return value;
+    throw new Error(
+        `createDatabase(sharedConfig) requires the DB_ADAPTER env var to be 'mysql' or 'postgres' (got: ${value ?? 'undefined'}). ` +
+            `Either set DB_ADAPTER or call createDatabase(dialect, config) explicitly.`
+    );
+}

package/src/database/index.ts

@@ -1,7 +1,9 @@
 export * from './common';
 export * from './dialect';
 export * from './entity';
+export * from './factory';
 export { createMigration, runMigrations, standardizeDbCollation } from './migration';
+export * from './schema';
 export * from './mysql';
 export * from './postgres';
 export * from './types';