fastify-auto-sqlapi 0.1.2 → 0.1.3

package/AGENTS_BACKEND.md

@@ -305,6 +305,25 @@ export const TableCustomer = defineTable({
     // Mutate fields before UPDATE. camelCase. PK is present for reference but excluded from UPDATE SET.
     fields.updatedBy = req.user.id;
   },
+  afterUpdate: async (db, req, record, secondaryRecords, deletionRecords) => {
+    // Called after UPDATE + secondaries + deletions, INSIDE the write transaction: throwing rolls back.
+  },
+  beforeDelete: async (db, req, id) => {
+    // Throw to abort the single delete. For tenant-scoped tables runs only after ownership is verified.
+  },
+  afterDelete: async (db, req, id) => {
+    // Called after a successful single delete (not on 404).
+  },
+  beforeBulkDelete: async (db, req, ids) => {
+    // Called ONCE with all ids before a bulk delete. Throw to abort the whole batch.
+  },
+  afterBulkDelete: async (db, req, deletedIds) => {
+    // Called ONCE with the ids ACTUALLY deleted (may be a subset of the requested ids).
+  },
+
+  // OPERATIONS — whitelist of auto-generated HTTP routes for this table.
+  // Omitted = ALL operations exposed (default-open!). Does not affect programmatic sqlApi.*.
+  // operations: ['search', 'get'],
 
   // AUTH — per-table request hooks
   onRequests: [
@@ -340,6 +359,21 @@ buildRelation(mainSchema, mainField, joinSchema, joinField, options?)
 
 **Choosing `unique`**: if `joinField` is the PK (or part of the composite PK) of `joinSchema`, the relation is N:1 — you almost certainly want `unique: true` so the alias is usable in `joinLeft`.
 
+**Owned child tables (translations, `*_info` details): use a writeJoin, not a standalone table.** A table that only exists as a child of a parent — e.g. `product_info` with composite PK `(product_id, lang)` — should be an `allowedWriteJoins` on the parent, not its own `DbTables` entry. The engine auto-fills the FK (`product_id`); add it to `upsertMap` (conflict key = the composite PK) to upsert children passing only their own fields. Avoids redundant endpoints/validators.
+
+```typescript
+// on the parent (product) table:
+allowedWriteJoins: [
+  buildRelation(SchemaProduct, 'id', SchemaProductInfo, 'productId', { alias: 'translations' }),
+],
+upsertMap: buildUpsertRules(
+  buildUpsertRule(SchemaProductInfo, ['productId', 'lang']),  // composite conflict key
+),
+// → PUT /rest/product { "main": {...}, "secondaries": { "translations": [{ "lang": "en", "name": "Bike" }] } }
+```
+
+Expose a composite-PK table as a standalone CRUD table only when it stands on its own (M:N link tables, natural keys) — composite PKs are fully supported there too.
+
 **Aliasing the same table twice**: declare two `buildRelation` entries with different `alias`. Example: a `session` table referencing `user` for both `createdBy` and `updatedBy`:
 
 ```typescript
@@ -724,7 +758,7 @@ Tables without `tenantScope` are unaffected — no filtering regardless of `getT
 - **`schemaOverrides`**: override auto-generated schema fields with stricter TypeBox types (e.g. `{ email: Type.String({ format: 'email' }) }`). Overrides are merged into the body schema for insert, update, and bulk-upsert. The original Schema file is never modified. In updates, overridden fields are still wrapped in Optional (validates only when present). Overrides appear in Swagger.
 - **Validation receives camelCase**: `validate` receives the original camelCase record (as sent by the client) and secondaries. Field names match the schema definition, with full TypeScript inference (`main.startDate`, not `main.start_date`). It returns `ValidationError[]` — tuples of `[field, code]` or `[field, code, message]`. If any errors are returned, the request is rejected with 400 before hooks or SQL execute.
 - **`validateBulk` replaces `validate` in bulk**: when `validateBulk` is defined, it is called once with all items and per-item `validate` is skipped. This allows optimized batch queries instead of N individual checks. When only `validate` is defined, it runs per-item as fallback.
-- **All hooks and validators receive camelCase records**: `validate`, `beforeInsert`, `beforeUpdate`, and `afterInsert` all get records keyed by schema field names (camelCase). Mutations propagate to the SQL (plugin converts to DB column format via `colMap` after the hook). The engine internally uses `snakecaseRecord(..., schema)` after user mutations to map field names to actual DB columns.
+- **All hooks and validators receive camelCase records**: `validate` and the whole hook matrix (`beforeInsert`/`afterInsert`, `beforeUpdate`/`afterUpdate`, `beforeDelete`/`afterDelete`, `beforeBulkDelete`/`afterBulkDelete`) get records keyed by schema field names (camelCase). Mutations propagate to the SQL (plugin converts to DB column format via `colMap` after the hook). The engine internally uses `snakecaseRecord(..., schema)` after user mutations to map field names to actual DB columns.
 - **Filters validation**: TypeBox schemas use `additionalProperties: false`. By default Fastify strips unknown fields silently. For 400 errors on unknown filters: `Fastify({ ajv: { customOptions: { removeAdditional: false } } })`.
 - **Tenant filtering**: when `tenantScope` is set on a table and `getTenantId` is provided in plugin options, all CRUD operations are automatically scoped to the tenant. `getTenantId` returning `null`/`undefined` = admin (no filter). Returning an array = multi-tenant user (IN clause).
 

package/README.md

@@ -14,7 +14,8 @@ Point it at your database, and get a full REST API with search, advanced conditi
 - **Bulk operations** — batch insert/upsert/delete in single queries
 - **Multi-tenant** — automatic row-level isolation, zero code in handlers
 - **Validation** — structured field-level validation with cross-entity support
-- **Hooks** — `beforeInsert`, `beforeUpdate`, `afterInsert` for custom logic
+- **Hooks** — full before/after matrix (insert, update, delete, bulk delete) for custom logic
+- **Transactions** — insert/update with secondaries run atomically (rollback on failure)
 - **Swagger UI** — optional, auto-configured from your schemas
 - **Composable** — register all routes or pick only what you need
 
@@ -183,10 +184,16 @@ const TableCustomer = defineTable({
     return [];
   },
 
-  // Hooks (runs after validation) — all receive camelCase records (schema field names)
+  // Hooks (run after validation) — all receive camelCase records (schema field names).
+  // after* hooks for insert/update run INSIDE the write transaction: throwing rolls back.
   beforeInsert: async (db, req, record) => { /* camelCase; mutations propagate to INSERT */ },
-  beforeUpdate: async (db, req, fields) => { /* camelCase; PK included for reference, excluded from UPDATE SET */ },
   afterInsert: async (db, req, record, secondaryRecords) => { /* camelCase; input merged with generated PK */ },
+  beforeUpdate: async (db, req, fields) => { /* camelCase; PK included for reference, excluded from UPDATE SET */ },
+  afterUpdate: async (db, req, record, secondaryRecords, deletionRecords) => { /* after UPDATE + secondaries + deletions */ },
+  beforeDelete: async (db, req, id) => { /* throw to abort the deletion */ },
+  afterDelete: async (db, req, id) => { /* after a successful single delete */ },
+  beforeBulkDelete: async (db, req, ids) => { /* called ONCE with all ids; throw to abort the batch */ },
+  afterBulkDelete: async (db, req, deletedIds) => { /* called ONCE with the ids ACTUALLY deleted */ },
 
   // Auth (per-table)
   onRequests: [
@@ -247,6 +254,46 @@ await app.register(fastifyAutoSqlApi, {
 
 For MySQL/MariaDB, register `mysql2/promise` pool instead of `@fastify/postgres` and pass `dialect: 'mysql'` or `'mariadb'`.
 
+## Security
+
+> ⚠️ **The plugin is open by default.** Registering it without any configuration exposes
+> **all operations on all tables in `DbTables`** (read AND write, including bulk delete) to
+> anyone who can reach the server. This is intentional — the plugin provides the tools and
+> does not impose an auth model — but it means **you** are responsible for locking it down
+> before exposing it.
+
+Three layers are available, combinable:
+
+**1. Authentication / authorization hooks** — `onRequests` runs before every auto-generated
+route (globally or per table):
+
+```typescript
+await app.register(fastifyAutoSqlApi, {
+  DbTables: dbTables,
+  onRequests: [async (request, reply) => {
+    await request.jwtVerify(); // or any auth check; throw/reply to block
+  }],
+});
+```
+
+**2. Per-table operation whitelist** — `operations` limits which routes are registered for a
+table. Omitted = all operations (default). Unlisted operations are not registered at all
+(they answer 404):
+
+```typescript
+const TableAuditLog = defineTable({
+  primary: 'id',
+  ...exportTableInfo(SchemaAuditLog),
+  operations: ['search', 'get'], // read-only over HTTP: no insert/update/delete/bulk
+});
+```
+
+Note: `operations` gates the HTTP routes only. The programmatic `fastify.sqlApi.*` methods
+are always available to your own code.
+
+**3. Multi-tenancy** — `getTenantId` + `tenantScope` filter every query by tenant (see
+[Multi-Tenant](#multi-tenant)).
+
 ## API Reference
 
 ### POST /search/{table}
@@ -356,6 +403,20 @@ Returns `{ main: { ... } }` or 404.
 
 `secondaries` keys are the **alias** declared in `allowedWriteJoins`. FK fields are auto-filled from the inserted main record.
 
+> **Owned child tables (translations, `*_info` details): use a writeJoin, not a standalone table.**
+> A table that only exists as a child of a parent — e.g. `product_info` with composite PK `(product_id, lang)` — should be an `allowedWriteJoins` on the parent, not its own `DbTables` entry. The engine auto-fills the FK (`product_id`); add it to `upsertMap` (conflict key = the composite PK) to upsert children passing only their own fields:
+> ```typescript
+> // on the parent (product) table:
+> allowedWriteJoins: [
+>   buildRelation(SchemaProduct, 'id', SchemaProductInfo, 'productId', { alias: 'translations' }),
+> ],
+> upsertMap: buildUpsertRules(
+>   buildUpsertRule(SchemaProductInfo, ['productId', 'lang']),  // composite conflict key
+> ),
+> // → PUT /rest/product { "main": {...}, "secondaries": { "translations": [{ "lang": "en", "name": "Bike" }] } }
+> ```
+> Expose a composite-PK table as a standalone CRUD table only when it stands on its own (M:N link tables, natural keys) — composite PKs are fully supported there too.
+
 **Response (201):** `{ main: { ... }, secondaries: { ... } }`
 
 ### PUT /rest/{table}
@@ -495,7 +556,7 @@ await app.register(async (instance) => {
 
 ## Conventions
 
-- **camelCase everywhere in the API** — requests, responses, `validate`, and all hooks (`beforeInsert`, `beforeUpdate`, `afterInsert`) use schema field names
+- **camelCase everywhere in the API** — requests, responses, `validate`, and all hooks (`beforeInsert`/`afterInsert`, `beforeUpdate`/`afterUpdate`, `beforeDelete`/`afterDelete`, `beforeBulkDelete`/`afterBulkDelete`) use schema field names
 - **Conversion to DB column format is automatic** via `colMap` — supports both snake_case and camelCase DB columns (e.g. betterauth-style)
 - **Aliases identify joins** — declared in `buildRelation({ alias })`, used as keys in request/response/`secondaries`/dotted notation
 - **`joinMustExist` / `joinMultiple` / `joinGroup`** are 1:N (child→main) and use side queries / EXISTS / correlated subqueries — no row duplication

package/dist/bin/generate-schema.js

@@ -54,10 +54,10 @@ await runCli('fastify-auto-sqlapi: generating schemas', async () => {
     let untouched = 0;
     const generatedFiles = new Set();
     for (const schemaName of Object.keys(tableMap)) {
-        const { name: tableName, fields, colMap } = tableMap[schemaName];
+        const { name: tableName, fields, colMap, primary } = tableMap[schemaName];
         const filename = path.join(schemasDir, `${schemaName}.ts`);
         generatedFiles.add(`${schemaName}.ts`);
-        const content = generateSchemaFile(schemaName, tableName, fields, colMap);
+        const content = generateSchemaFile(schemaName, tableName, fields, colMap, primary);
         let status = 'created';
         let color = CONSOLE_COLORS.green;
         if (fs.existsSync(filename)) {

package/dist/index.d.ts

@@ -30,5 +30,5 @@ export { BulkDeleteTableBody, BulkDeleteTableResponse } from './lib/schema/bulk-
 export { default as bulkDeleteRoutes } from './routes/auto/bulk-delete.routes.js';
 export { Type, type Static } from '@sinclair/typebox';
 export { ConditionBuilder, Expression } from 'node-condition-builder';
-export type { SqlApiConfig, ColumnInfo, TableMap, Queryable, SqlResult, DbRecord, DbRecordValue, SelectOptions, SchemaDefinition, JoinDefinition, ITable, DbTables, SqlApiPluginOptions, SwaggerOptions, SearchParams, SearchResult, Paginator, PaginationResult, TableFilterFn, ExtendedConditionFn, FilterRecord, AggregationRequest, JoinGroupRequest, ComputedFieldFn, ComputedFieldContext, ComputedFieldExpr, GetParams, GetResult, DeleteParams, DeleteResult, InsertParams, InsertResult, BulkUpsertItem, BulkUpsertParams, BulkUpsertResult, BulkDeleteParams, BulkDeleteResult, ConditionMethod, SearchCondition, UpdateParams, UpdateResult, TenantId, TenantScope, TenantScopeDirect, TenantScopeIndirect, TenantContext, ValidationError, ValidatorFn, BulkValidatorItem, BulkValidatorFn, } from './types.js';
+export type { SqlApiConfig, ColumnInfo, TableMap, Queryable, TransactionQueryable, SqlResult, DbRecord, DbRecordValue, SelectOptions, SchemaDefinition, JoinDefinition, ITable, TableOperation, DbTables, SqlApiPluginOptions, SwaggerOptions, SearchParams, SearchResult, Paginator, PaginationResult, TableFilterFn, ExtendedConditionFn, FilterRecord, AggregationRequest, JoinGroupRequest, ComputedFieldFn, ComputedFieldContext, ComputedFieldExpr, GetParams, GetResult, DeleteParams, DeleteResult, InsertParams, InsertResult, BulkUpsertItem, BulkUpsertParams, BulkUpsertResult, BulkDeleteParams, BulkDeleteResult, ConditionMethod, SearchCondition, UpdateParams, UpdateResult, TenantId, TenantScope, TenantScopeDirect, TenantScopeIndirect, TenantContext, ValidationError, ValidatorFn, BulkValidatorItem, BulkValidatorFn, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1E,OAAO,EAAE,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAGxH,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxD,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIlH,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC1G,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGzE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGzE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGlF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGlF,OAAO,EAAE,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGtE,YAAY,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,QAAQ,EACR,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,MAAM,EACN,cAAc,EACd,QAAQ,EACR,mBAAmB,EACnB,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACpB,iBAAiB,EACjB,SAAS,EACT,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,eAAe,GAChB,MAAM,YAAY,CAAC"}

package/dist/lib/adapters/mysql-adapter.d.ts

@@ -4,6 +4,10 @@ export interface MysqlQueryable {
         affectedRows?: number;
         insertId?: number;
     }, unknown]>;
+    /** Present on mysql2 promise pools (and @fastify/mysql): checks out a dedicated connection. */
+    getConnection?(): Promise<MysqlQueryable & {
+        release(): void;
+    }>;
 }
 export declare function mysqlQueryable(pool: MysqlQueryable): Queryable;
 //# sourceMappingURL=mysql-adapter.d.ts.map

package/dist/lib/adapters/mysql-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapters/mysql-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAE3D,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,CAAC,CAAC;CAC3E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,CAyB9D"}
+{"version":3,"file":"mysql-adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapters/mysql-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAmC,MAAM,gBAAgB,CAAC;AAEjF,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1E,+FAA+F;IAC/F,aAAa,CAAC,IAAI,OAAO,CAAC,cAAc,GAAG;QAAE,OAAO,IAAI,IAAI,CAAA;KAAE,CAAC,CAAC;CACjE;AA2BD,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,CAc9D"}

package/dist/lib/adapters/mysql-adapter.js

@@ -1,21 +1,32 @@
-export function mysqlQueryable(pool) {
-    return {
-        async query(text, values) {
-            const [result] = await pool.query(text, values);
-            // SELECT returns an array of rows
-            if (Array.isArray(result) && !('affectedRows' in result)) {
-                return {
-                    rows: result,
-                    affectedRows: result.length,
-                };
-            }
-            // INSERT/UPDATE/DELETE returns ResultSetHeader-like
-            const header = result;
+function wrapQuery(client) {
+    return async (text, values) => {
+        const [result] = await client.query(text, values);
+        // SELECT returns an array of rows
+        if (Array.isArray(result) && !('affectedRows' in result)) {
             return {
-                rows: [],
-                affectedRows: header.affectedRows ?? 0,
-                insertId: header.insertId,
+                rows: result,
+                affectedRows: result.length,
             };
-        },
+        }
+        // INSERT/UPDATE/DELETE returns ResultSetHeader-like
+        const header = result;
+        return {
+            rows: [],
+            affectedRows: header.affectedRows ?? 0,
+            insertId: header.insertId,
+        };
     };
 }
+export function mysqlQueryable(pool) {
+    const queryable = { query: wrapQuery(pool) };
+    if (typeof pool.getConnection === 'function') {
+        queryable.connect = async () => {
+            const conn = await pool.getConnection();
+            return {
+                query: wrapQuery(conn),
+                release: () => conn.release(),
+            };
+        };
+    }
+    return queryable;
+}

package/dist/lib/adapters/pg-adapter.d.ts

@@ -4,6 +4,10 @@ export interface PgQueryable {
         rows: T[];
         rowCount: number | null;
     }>;
+    /** Present on pg.Pool (and @fastify/postgres): checks out a dedicated client. */
+    connect?(): Promise<PgQueryable & {
+        release(): void;
+    }>;
 }
 export declare function pgQueryable(client: PgQueryable): Queryable;
 //# sourceMappingURL=pg-adapter.d.ts.map

package/dist/lib/adapters/pg-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CACpD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAa1D"}
+{"version":3,"file":"pg-adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAmC,MAAM,gBAAgB,CAAC;AAEjF,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACjB,OAAO,CAAC;QAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IACnD,iFAAiF;IACjF,OAAO,CAAC,IAAI,OAAO,CAAC,WAAW,GAAG;QAAE,OAAO,IAAI,IAAI,CAAA;KAAE,CAAC,CAAC;CACxD;AAeD,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAc1D"}

package/dist/lib/adapters/pg-adapter.js

@@ -1,11 +1,22 @@
+function wrapQuery(client) {
+    return async (text, values) => {
+        const result = await client.query(text, values);
+        return {
+            rows: result.rows,
+            affectedRows: result.rowCount ?? 0,
+        };
+    };
+}
 export function pgQueryable(client) {
-    return {
-        async query(text, values) {
-            const result = await client.query(text, values);
+    const queryable = { query: wrapQuery(client) };
+    if (typeof client.connect === 'function') {
+        queryable.connect = async () => {
+            const conn = await client.connect();
             return {
-                rows: result.rows,
-                affectedRows: result.rowCount ?? 0,
+                query: wrapQuery(conn),
+                release: () => conn.release(),
             };
-        },
-    };
+        };
+    }
+    return queryable;
 }

package/dist/lib/cli/mysql-introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/mysql-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,0BAA0B,IAAI;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAmBA;AAkDD,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CAyBvB"}
+{"version":3,"file":"mysql-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/mysql-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,0BAA0B,IAAI;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAmBA;AAkDD,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAClG,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CA2BvB"}

package/dist/lib/cli/mysql-introspect.js

@@ -70,7 +70,7 @@ export async function introspectMysqlTables(connectionConfig, schema) {
     const mysql2 = loadOptionalDependency('mysql2/promise', 'npm install mysql2');
     const connection = await mysql2.createConnection(connectionConfig);
     try {
-        const [rows] = await connection.query(`SELECT table_name, column_name, data_type, column_default, is_nullable
+        const [rows] = await connection.query(`SELECT table_name, column_name, data_type, column_default, is_nullable, column_key, extra
        FROM information_schema.columns
        WHERE table_schema = ?
        ORDER BY table_name, ordinal_position`, [schema]);
@@ -81,6 +81,8 @@ export async function introspectMysqlTables(connectionConfig, schema) {
             udt_name: mapMysqlType(row.DATA_TYPE || row.data_type),
             column_default: row.COLUMN_DEFAULT || row.column_default,
             is_nullable: row.IS_NULLABLE || row.is_nullable,
+            is_primary: (row.COLUMN_KEY || row.column_key) === 'PRI',
+            is_auto_increment: String(row.EXTRA || row.extra || '').includes('auto_increment'),
         }));
     }
     finally {

package/dist/lib/cli/pg-introspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/pg-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C;AAED,wBAAsB,gBAAgB,CACpC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CAqBvB"}
+{"version":3,"file":"pg-introspect.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/pg-introspect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C;AAED,wBAAsB,gBAAgB,CACpC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CA8BvB"}

package/dist/lib/cli/pg-introspect.js

@@ -16,10 +16,19 @@ export async function introspectTables(connectionString, schema) {
     const client = new pg.Client({ connectionString });
     try {
         await client.connect();
-        const result = await client.query(`SELECT table_name, column_name, udt_name, column_default, is_nullable
-       FROM information_schema.columns
-       WHERE table_schema = $1
-       ORDER BY table_name, ordinal_position`, [schema]);
+        const result = await client.query(`SELECT c.table_name, c.column_name, c.udt_name, c.column_default, c.is_nullable,
+              (pk.column_name IS NOT NULL) AS is_primary
+       FROM information_schema.columns c
+       LEFT JOIN (
+         SELECT kcu.table_name, kcu.column_name
+         FROM information_schema.table_constraints tc
+         JOIN information_schema.key_column_usage kcu
+           ON tc.constraint_name = kcu.constraint_name
+          AND tc.table_schema = kcu.table_schema
+         WHERE tc.constraint_type = 'PRIMARY KEY' AND tc.table_schema = $1
+       ) pk ON pk.table_name = c.table_name AND pk.column_name = c.column_name
+       WHERE c.table_schema = $1
+       ORDER BY c.table_name, c.ordinal_position`, [schema]);
         return result.rows;
     }
     finally {

package/dist/lib/cli/schema-codegen.d.ts

@@ -2,7 +2,8 @@ import type { ColumnInfo, TableMap } from '../../types.js';
 export declare function convertColType(udtName: string, columnInfo: {
     column_default: string | null;
     is_nullable: string;
+    is_auto_increment?: boolean;
 }): string;
 export declare function buildTableMap(rows: ColumnInfo[]): TableMap;
-export declare function generateSchemaFile(schemaName: string, tableName: string, fields: Record<string, string>, colMap: Record<string, string>): string;
+export declare function generateSchemaFile(schemaName: string, tableName: string, fields: Record<string, string>, colMap: Record<string, string>, primary?: string[]): string;
 //# sourceMappingURL=schema-codegen.d.ts.map

package/dist/lib/cli/schema-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/schema-codegen.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE3D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;IAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACjE,MAAM,CAoDR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAqB1D;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,MAAM,CA2CR"}
+{"version":3,"file":"schema-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/schema-codegen.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE3D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;IAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC9F,MAAM,CAqDR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAqC1D;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,MAAM,CA4CR"}

package/dist/lib/cli/schema-codegen.js

@@ -1,6 +1,7 @@
 import { toCamelCase, toSchemaName } from '../naming.js';
 export function convertColType(udtName, columnInfo) {
-    const hasDefault = columnInfo.column_default;
+    // AUTO_INCREMENT (mysql) behaves like a default: the DB generates the value.
+    const hasDefault = columnInfo.column_default || columnInfo.is_auto_increment;
     const isNullable = columnInfo.is_nullable === 'YES';
     const wrap = (t) => {
         return hasDefault || isNullable ? `Type.Optional(${t})` : t;
@@ -58,17 +59,30 @@ export function buildTableMap(rows) {
                 name: row.table_name,
                 fields: {},
                 colMap: {},
+                primary: [],
             };
         }
         const fieldName = toCamelCase(row.column_name);
+        // Two columns mapping to the same camelCase field (e.g. user_name + userName) would
+        // silently overwrite each other in the colMap, dropping one column from the API.
+        const existing = acc[schemaName].colMap[fieldName];
+        if (existing !== undefined && existing !== row.column_name) {
+            throw new Error(`Naming collision on table "${row.table_name}": columns "${existing}" and ` +
+                `"${row.column_name}" both map to the API field "${fieldName}". ` +
+                `Rename one of the columns (or exclude the table) before generating schemas.`);
+        }
         acc[schemaName].fields[fieldName] = convertColType(row.udt_name, row);
         acc[schemaName].colMap[fieldName] = row.column_name;
+        if (row.is_primary) {
+            acc[schemaName].primary.push(fieldName);
+        }
         return acc;
     }, {});
 }
-export function generateSchemaFile(schemaName, tableName, fields, colMap) {
+export function generateSchemaFile(schemaName, tableName, fields, colMap, primary) {
     const fieldsStr = JSON.stringify(fields, null, 2).replace(/"(.*?)"\s*:\s*"Type(.*?)"/g, '$1: Type$2');
     const colMapStr = JSON.stringify(colMap, null, 2);
+    const primaryKeyLine = primary?.length ? `\n  primaryKey: ${JSON.stringify(primary)},` : '';
     return `// Auto-generated by fastify-auto-sqlapi. Do not edit.
 import { Type } from "fastify-auto-sqlapi";
 import type { Static } from "fastify-auto-sqlapi";
@@ -94,7 +108,7 @@ export const Schema = {
   fields: _Schema,
   validation,
   tableName: "${tableName}",
-  partialValidation,
+  partialValidation,${primaryKeyLine}
 };
 export const ${schemaName} = Schema;
 export type TypeSchema = Static<typeof Schema.validation>;

package/dist/lib/cli/tables-codegen.d.ts

@@ -3,6 +3,8 @@ export interface ParsedSchema {
     tableName: string;
     fields: string[];
     fieldTypes: Record<string, string>;
+    /** PRIMARY KEY fields declared in the schema file (`primaryKey: [...]`), when present. */
+    primary?: string[];
 }
 export interface DetectedRelation {
     parentSchemaName: string;

package/dist/lib/cli/tables-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tables-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/tables-codegen.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CA2BpE;AAgBD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,EAAE,CAwB3E;AAID,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAwHhG;AAID,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAqBrE;AAID,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CA6FlE"}
+{"version":3,"file":"tables-codegen.d.ts","sourceRoot":"","sources":["../../../src/lib/cli/tables-codegen.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,0FAA0F;IAC1F,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAuCpE;AAuCD,wBAAgB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,gBAAgB,EAAE,CAwB3E;AAID,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAwHhG;AAID,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAqBrE;AAID,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CA6FlE"}

package/dist/lib/cli/tables-codegen.js

@@ -20,15 +20,34 @@ export function parseSchemaFile(content) {
     }
     if (fields.length === 0)
         return null;
+    // primaryKey: ["code"] — emitted by generate-schema from DB introspection
+    let primary;
+    const pkMatch = content.match(/primaryKey:\s*\[([^\]]*)\]/);
+    if (pkMatch) {
+        primary = pkMatch[1]
+            .split(',')
+            .map((s) => s.trim().replace(/^["']|["']$/g, ''))
+            .filter(Boolean);
+        if (primary.length === 0)
+            primary = undefined;
+    }
     return {
         schemaName: exportMatch[1],
         tableName: tableNameMatch[1],
         fields,
         fieldTypes,
+        primary,
     };
 }
 // ─── Detection ───────────────────────────────────────────────
 function detectPrimaryKey(schema) {
+    // Preferred source: the PK introspected from the DB (primaryKey in the schema file).
+    if (schema.primary?.length) {
+        const pk = schema.primary.length === 1 ? schema.primary[0] : schema.primary;
+        const first = schema.primary[0];
+        return { pk, autoIncrement: schema.fieldTypes[first]?.includes('Optional') ?? false };
+    }
+    // Heuristic fallback for hand-written/legacy schema files without primaryKey.
     if (schema.fields.includes('id')) {
         return { pk: 'id', autoIncrement: schema.fieldTypes['id']?.includes('Optional') ?? false };
     }
@@ -39,6 +58,18 @@ function detectPrimaryKey(schema) {
     }
     return { pk: schema.fields[0], autoIncrement: false };
 }
+/** First PK field: used for defaultOrder, relations and example snippets. */
+function pkFirst(pk) {
+    return Array.isArray(pk) ? pk[0] : pk;
+}
+/** Render the `primary:` value for the defineTable template. */
+function formatPrimary(pk) {
+    return Array.isArray(pk) ? `[${pk.map((p) => `'${p}'`).join(', ')}]` : `'${pk}'`;
+}
+/** All PK fields as an array, for "non-PK field" lookups in example snippets. */
+function pkFields(pk) {
+    return Array.isArray(pk) ? pk : [pk];
+}
 export function detectRelations(schemas) {
     const tableBySnakeName = new Map();
     for (const schema of schemas) {
@@ -55,7 +86,7 @@ export function detectRelations(schemas) {
                 const { pk } = detectPrimaryKey(parent);
                 relations.push({
                     parentSchemaName: parent.schemaName,
-                    parentField: pk,
+                    parentField: pkFirst(pk),
                     childSchemaName: schema.schemaName,
                     childField: field,
                 });
@@ -113,7 +144,7 @@ export function generateSingleTableFile(schema, allSchemas) {
     lines.push(``);
     lines.push(`// Fields: ${schema.fields.join(', ')}`);
     lines.push(`export const ${tableVarName} = defineTable({`);
-    lines.push(`  primary: '${pk}',`);
+    lines.push(`  primary: ${formatPrimary(pk)},`);
     lines.push(`  ...exportTableInfo(Schema),`);
     // Commented example with extraFilters + extendedCondition
     lines.push(`  // ...exportTableInfo(`);
@@ -123,9 +154,9 @@ export function generateSingleTableFile(schema, allSchemas) {
     lines.push(`  //     if (filters.q) condition.isILike(Schema.col('${schema.fields.includes('name') ? 'name' : schema.fields[0]}'), \`%\${filters.q}%\`);`);
     lines.push(`  //   }`);
     lines.push(`  // ),`);
-    lines.push(`  defaultOrder: '${pk}',`);
+    lines.push(`  defaultOrder: '${pkFirst(pk)}',`);
     if (autoIncrement) {
-        lines.push(`  excludeFromCreation: ['${pk}'],`);
+        lines.push(`  excludeFromCreation: ['${pkFirst(pk)}'],`);
     }
     else {
         lines.push(`  // excludeFromCreation: [],`);
@@ -140,14 +171,14 @@ export function generateSingleTableFile(schema, allSchemas) {
     else {
         lines.push(`  // allowedReadJoins: [],`);
     }
-    lines.push(`  // upsertMap: buildUpsertRules(buildUpsertRule(Schema, ['${pk}'])),`);
+    lines.push(`  // upsertMap: buildUpsertRules(buildUpsertRule(Schema, [${pkFields(pk).map((p) => `'${p}'`).join(', ')}])),`);
     // schemaOverrides: suggest email format if email field exists, otherwise minLength on first string field
     const emailField = schema.fields.find(f => f.toLowerCase().includes('email'));
     if (emailField) {
         lines.push(`  // schemaOverrides: { ${emailField}: Type.String({ format: 'email' }) },`);
     }
     else {
-        const stringField = schema.fields.find(f => f !== pk && schema.fieldTypes[f]?.includes('String'));
+        const stringField = schema.fields.find(f => !pkFields(pk).includes(f) && schema.fieldTypes[f]?.includes('String'));
         if (stringField) {
             lines.push(`  // schemaOverrides: { ${stringField}: Type.String({ minLength: 1 }) },`);
         }
@@ -156,7 +187,7 @@ export function generateSingleTableFile(schema, allSchemas) {
         }
     }
     // validate: use first non-PK field for example
-    const exampleField = schema.fields.find(f => f !== pk) || schema.fields[0];
+    const exampleField = schema.fields.find(f => !pkFields(pk).includes(f)) || schema.fields[0];
     lines.push(`  validate: async (db, req, main, secondaries) => {`);
     lines.push(`    const errors: ValidationError[] = [];`);
     lines.push(`    // if (!main.${exampleField}) errors.push(['${exampleField}', 'required']);`);
@@ -225,11 +256,11 @@ export function generateTablesFile(schemas) {
         lines.push(`// ─── ${schema.tableName} ──────────────────────────────`);
         lines.push(`// Fields: ${schema.fields.join(', ')}`);
         lines.push(`const ${tableVarName} = defineTable({`);
-        lines.push(`  primary: '${pk}',`);
+        lines.push(`  primary: ${formatPrimary(pk)},`);
         lines.push(`  ...exportTableInfo(${schema.schemaName}),`);
-        lines.push(`  defaultOrder: '${pk}',`);
+        lines.push(`  defaultOrder: '${pkFirst(pk)}',`);
         if (autoIncrement) {
-            lines.push(`  excludeFromCreation: ['${pk}'],`);
+            lines.push(`  excludeFromCreation: ['${pkFirst(pk)}'],`);
         }
         else {
             lines.push(`  // excludeFromCreation: [],`);
@@ -244,9 +275,9 @@ export function generateTablesFile(schemas) {
         else {
             lines.push(`  // allowedReadJoins: [],`);
         }
-        lines.push(`  // upsertMap: buildUpsertRules(buildUpsertRule(${schema.schemaName}, ['${pk}'])),`);
+        lines.push(`  // upsertMap: buildUpsertRules(buildUpsertRule(${schema.schemaName}, [${pkFields(pk).map((p) => `'${p}'`).join(', ')}])),`);
         lines.push(`  // schemaOverrides: {},`);
-        const exampleFieldLegacy = schema.fields.find(f => f !== pk) || schema.fields[0];
+        const exampleFieldLegacy = schema.fields.find(f => !pkFields(pk).includes(f)) || schema.fields[0];
         lines.push(`  validate: async (db, req, main, secondaries) => {`);
         lines.push(`    const errors: ValidationError[] = [];`);
         lines.push(`    // if (!main.${exampleFieldLegacy}) errors.push(['${exampleFieldLegacy}', 'required']);`);

package/dist/lib/db.d.ts

@@ -13,10 +13,27 @@ export declare class QueryClient {
     get qi(): (id: string) => string;
     get ph(): (i: number) => string;
     get dialectName(): string;
+    /** ConditionBuilder dialect ('postgres' | 'mysql') for per-instance builders. */
+    get cbDialect(): SqlDialect['cbDialect'];
+    /** Whether the dialect supports `RETURNING` (postgres/mariadb: yes, mysql: no). */
+    get supportsReturning(): boolean;
+    /** Build the ` RETURNING <quoted pk>` suffix ('' when unsupported). */
+    get returningPk(): SqlDialect['returningPk'];
     get dateTrunc(): SqlDialect['dateTrunc'];
     setDebug(mode: boolean): void;
     expression(value: string): Expression;
     query<T = Record<string, unknown>>(text: string, values?: unknown[]): Promise<SqlResult<T>>;
+    /**
+     * Run `fn` inside a DB transaction on a dedicated connection (BEGIN/COMMIT, with
+     * ROLLBACK + rethrow on error). Requires the underlying Queryable to expose
+     * `connect()`; when it does not (legacy custom adapters), `fn` runs directly on
+     * this client without transactional guarantees.
+     *
+     * Nested calls join the outer transaction: the tx QueryClient wraps a dedicated
+     * connection that has no `connect()`, so an inner `withTransaction` is a no-op
+     * wrapper around the same connection.
+     */
+    withTransaction<T>(fn: (tx: QueryClient) => Promise<T>): Promise<T>;
     insert(table: string, record: DbRecord, pkCol: string | string[]): Promise<Record<string, unknown>>;
     insertOrUpdate(table: string, record: DbRecord, conflictKeys: string[], pkCol: string | string[]): Promise<Record<string, unknown>>;
     bulkInsert(table: string, records: DbRecord[], pkCol: string | string[], chunkSize?: number): Promise<Record<string, unknown>[]>;