turbine-orm 0.9.1 → 0.10.0

package/dist/cjs/cli/studio.js

@@ -38,7 +38,7 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const pg_1 = __importDefault(require("pg"));
 const introspect_js_1 = require("../introspect.js");
-const query_js_1 = require("../query.js");
+const index_js_1 = require("../query/index.js");
 const studio_ui_generated_js_1 = require("./studio-ui.generated.js");
 // ---------------------------------------------------------------------------
 // Main entry point
@@ -74,7 +74,8 @@ async function startStudio(options) {
     });
     const authToken = (0, node_crypto_1.randomBytes)(24).toString('hex');
     const stateDir = (0, node_path_1.resolve)(options.stateDir ?? '.turbine');
-    const ctx = { pool, metadata, options, authToken, stateDir };
+    const statementTimeoutSQL = options.adapter?.statementTimeout?.(30) ?? `SET LOCAL statement_timeout = '30s'`;
+    const ctx = { pool, metadata, options, authToken, stateDir, statementTimeoutSQL };
     const server = (0, node_http_1.createServer)((req, res) => {
         handleRequest(req, res, ctx).catch((err) => {
             sendJson(res, 500, { error: err instanceof Error ? err.message : String(err) });
@@ -259,10 +260,10 @@ async function apiTableRows(res, ctx, rawTableName, params) {
     if (orderByRaw) {
         const col = resolveColumnName(table, orderByRaw);
         if (col)
-            orderByClause = `ORDER BY ${(0, query_js_1.quoteIdent)(col)} ${dir}`;
+            orderByClause = `ORDER BY ${(0, index_js_1.quoteIdent)(col)} ${dir}`;
     }
     if (!orderByClause && table.primaryKey.length > 0 && table.primaryKey[0]) {
-        orderByClause = `ORDER BY ${(0, query_js_1.quoteIdent)(table.primaryKey[0])} ${dir}`;
+        orderByClause = `ORDER BY ${(0, index_js_1.quoteIdent)(table.primaryKey[0])} ${dir}`;
     }
     // Full-text-ish search: ILIKE across text/varchar columns. The value is
     // parameterized so injection is impossible. Each query gets its own
@@ -276,7 +277,7 @@ async function apiTableRows(res, ctx, rawTableName, params) {
     let mainWhere = '';
     if (hasSearch && pattern !== null) {
         mainValues.push(pattern);
-        const conds = textColumns.map((c) => `${(0, query_js_1.quoteIdent)(c)} ILIKE $3`);
+        const conds = textColumns.map((c) => `${(0, index_js_1.quoteIdent)(c)} ILIKE $3`);
         mainWhere = `WHERE (${conds.join(' OR ')})`;
     }
     // Count query: $1 = pattern (if search)
@@ -284,16 +285,16 @@ async function apiTableRows(res, ctx, rawTableName, params) {
     let countWhere = '';
     if (hasSearch && pattern !== null) {
         countValues.push(pattern);
-        const conds = textColumns.map((c) => `${(0, query_js_1.quoteIdent)(c)} ILIKE $1`);
+        const conds = textColumns.map((c) => `${(0, index_js_1.quoteIdent)(c)} ILIKE $1`);
         countWhere = `WHERE (${conds.join(' OR ')})`;
     }
-    const qualifiedTable = `${(0, query_js_1.quoteIdent)(ctx.options.schema)}.${(0, query_js_1.quoteIdent)(table.name)}`;
+    const qualifiedTable = `${(0, index_js_1.quoteIdent)(ctx.options.schema)}.${(0, index_js_1.quoteIdent)(table.name)}`;
     const sql = `SELECT * FROM ${qualifiedTable} ${mainWhere} ${orderByClause} LIMIT $1 OFFSET $2`;
     const countSql = `SELECT COUNT(*)::text AS count FROM ${qualifiedTable} ${countWhere}`;
     const client = await ctx.pool.connect();
     try {
         await client.query('BEGIN READ ONLY');
-        await client.query(`SET LOCAL statement_timeout = '30s'`);
+        await client.query(ctx.statementTimeoutSQL);
         const result = await client.query(sql, mainValues);
         const countResult = await client.query(countSql, countValues);
         await client.query('COMMIT');
@@ -359,7 +360,7 @@ async function apiQuery(req, res, ctx) {
     const client = await ctx.pool.connect();
     try {
         await client.query('BEGIN READ ONLY');
-        await client.query(`SET LOCAL statement_timeout = '30s'`);
+        await client.query(ctx.statementTimeoutSQL);
         const started = Date.now();
         const result = await client.query(rawSql);
         const elapsedMs = Date.now() - started;
@@ -397,7 +398,7 @@ async function apiBuilder(req, res, ctx) {
     }
     let deferred;
     try {
-        const qi = new query_js_1.QueryInterface(ctx.pool, tableName, ctx.metadata, [], {
+        const qi = new index_js_1.QueryInterface(ctx.pool, tableName, ctx.metadata, [], {
             warnOnUnlimited: false,
             sqlCache: false,
             preparedStatements: false,
@@ -411,7 +412,7 @@ async function apiBuilder(req, res, ctx) {
     const client = await ctx.pool.connect();
     try {
         await client.query('BEGIN READ ONLY');
-        await client.query(`SET LOCAL statement_timeout = '30s'`);
+        await client.query(ctx.statementTimeoutSQL);
         const started = Date.now();
         const result = await client.query(deferred.sql, deferred.params);
         const elapsedMs = Date.now() - started;

package/dist/cjs/client.js

@@ -30,7 +30,7 @@ exports.TurbineClient = exports.TransactionClient = void 0;
 const pg_1 = __importDefault(require("pg"));
 const errors_js_1 = require("./errors.js");
 const pipeline_js_1 = require("./pipeline.js");
-const query_js_1 = require("./query.js");
+const index_js_1 = require("./query/index.js");
 /** Maps isolation level names to SQL */
 const ISOLATION_LEVELS = {
     ReadUncommitted: 'READ UNCOMMITTED',
@@ -79,7 +79,7 @@ class TransactionClient {
             // Create a QueryInterface that uses the transaction client as its "pool"
             // We use a proxy pool that routes queries through the transaction client
             const txPool = this.createTxPool();
-            qi = new query_js_1.QueryInterface(txPool, name, this.schema, this.middlewares, this.queryOptions);
+            qi = new index_js_1.QueryInterface(txPool, name, this.schema, this.middlewares, this.queryOptions);
             this.tableCache.set(name, qi);
         }
         return qi;
@@ -306,7 +306,7 @@ class TurbineClient {
     table(name) {
         let qi = this.tableCache.get(name);
         if (!qi) {
-            qi = new query_js_1.QueryInterface(this.pool, name, this.schema, this.middlewares, this.queryOptions);
+            qi = new index_js_1.QueryInterface(this.pool, name, this.schema, this.middlewares, this.queryOptions);
             this.tableCache.set(name, qi);
         }
         return qi;

package/dist/cjs/generate.js

@@ -233,7 +233,14 @@ function generateMetadata(schema) {
         // relations
         lines.push('      relations: {');
         for (const [relName, rel] of Object.entries(table.relations)) {
-            lines.push(`        ${relName}: { type: '${escSQ(rel.type)}', name: '${escSQ(rel.name)}', from: '${escSQ(rel.from)}', to: '${escSQ(rel.to)}', foreignKey: '${escSQ(rel.foreignKey)}', referenceKey: '${escSQ(rel.referenceKey)}' },`);
+            // Emit foreignKey/referenceKey as string for single-column, array for composite
+            const fkLiteral = Array.isArray(rel.foreignKey)
+                ? `[${rel.foreignKey.map((c) => `'${escSQ(c)}'`).join(', ')}]`
+                : `'${escSQ(rel.foreignKey)}'`;
+            const refLiteral = Array.isArray(rel.referenceKey)
+                ? `[${rel.referenceKey.map((c) => `'${escSQ(c)}'`).join(', ')}]`
+                : `'${escSQ(rel.referenceKey)}'`;
+            lines.push(`        ${relName}: { type: '${escSQ(rel.type)}', name: '${escSQ(rel.name)}', from: '${escSQ(rel.from)}', to: '${escSQ(rel.to)}', foreignKey: ${fkLiteral}, referenceKey: ${refLiteral} },`);
         }
         lines.push('      },');
         // indexes

package/dist/cjs/index.js

@@ -34,7 +34,13 @@
  * ```
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.turbineHttp = exports.schemaToSQLString = exports.schemaToSQL = exports.schemaPush = exports.schemaDiff = exports.table = exports.defineSchema = exports.column = exports.ColumnBuilder = exports.snakeToPascal = exports.snakeToCamel = exports.singularize = exports.pgTypeToTs = exports.pgArrayType = exports.isDateType = exports.camelToSnake = exports.QueryInterface = exports.pipelineSupported = exports.executePipeline = exports.introspect = exports.generate = exports.wrapPgError = exports.ValidationError = exports.UniqueConstraintError = exports.TurbineErrorCode = exports.TurbineError = exports.TimeoutError = exports.setErrorMessageMode = exports.SerializationFailureError = exports.RelationError = exports.PipelineError = exports.NotNullViolationError = exports.NotFoundError = exports.MigrationError = exports.getErrorMessageMode = exports.ForeignKeyError = exports.DeadlockError = exports.ConnectionError = exports.CircularRelationError = exports.CheckConstraintError = exports.TurbineClient = exports.TransactionClient = void 0;
+exports.turbineHttp = exports.schemaToSQLString = exports.schemaToSQL = exports.schemaPush = exports.schemaDiff = exports.table = exports.defineSchema = exports.column = exports.ColumnBuilder = exports.snakeToPascal = exports.snakeToCamel = exports.singularize = exports.pgTypeToTs = exports.pgArrayType = exports.normalizeKeyColumns = exports.isDateType = exports.camelToSnake = exports.QueryInterface = exports.pipelineSupported = exports.executePipeline = exports.introspect = exports.generate = exports.wrapPgError = exports.ValidationError = exports.UniqueConstraintError = exports.TurbineErrorCode = exports.TurbineError = exports.TimeoutError = exports.setErrorMessageMode = exports.SerializationFailureError = exports.RelationError = exports.PipelineError = exports.NotNullViolationError = exports.NotFoundError = exports.MigrationError = exports.getErrorMessageMode = exports.ForeignKeyError = exports.DeadlockError = exports.ConnectionError = exports.CircularRelationError = exports.CheckConstraintError = exports.TurbineClient = exports.TransactionClient = exports.yugabytedb = exports.timescale = exports.postgresql = exports.cockroachdb = exports.alloydb = void 0;
+var index_js_1 = require("./adapters/index.js");
+Object.defineProperty(exports, "alloydb", { enumerable: true, get: function () { return index_js_1.alloydb; } });
+Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return index_js_1.cockroachdb; } });
+Object.defineProperty(exports, "postgresql", { enumerable: true, get: function () { return index_js_1.postgresql; } });
+Object.defineProperty(exports, "timescale", { enumerable: true, get: function () { return index_js_1.timescale; } });
+Object.defineProperty(exports, "yugabytedb", { enumerable: true, get: function () { return index_js_1.yugabytedb; } });
 // Client
 var client_js_1 = require("./client.js");
 Object.defineProperty(exports, "TransactionClient", { enumerable: true, get: function () { return client_js_1.TransactionClient; } });
@@ -71,12 +77,13 @@ var pipeline_js_1 = require("./pipeline.js");
 Object.defineProperty(exports, "executePipeline", { enumerable: true, get: function () { return pipeline_js_1.executePipeline; } });
 Object.defineProperty(exports, "pipelineSupported", { enumerable: true, get: function () { return pipeline_js_1.pipelineSupported; } });
 // Query builder
-var query_js_1 = require("./query.js");
-Object.defineProperty(exports, "QueryInterface", { enumerable: true, get: function () { return query_js_1.QueryInterface; } });
+var index_js_2 = require("./query/index.js");
+Object.defineProperty(exports, "QueryInterface", { enumerable: true, get: function () { return index_js_2.QueryInterface; } });
 // Schema utilities
 var schema_js_1 = require("./schema.js");
 Object.defineProperty(exports, "camelToSnake", { enumerable: true, get: function () { return schema_js_1.camelToSnake; } });
 Object.defineProperty(exports, "isDateType", { enumerable: true, get: function () { return schema_js_1.isDateType; } });
+Object.defineProperty(exports, "normalizeKeyColumns", { enumerable: true, get: function () { return schema_js_1.normalizeKeyColumns; } });
 Object.defineProperty(exports, "pgArrayType", { enumerable: true, get: function () { return schema_js_1.pgArrayType; } });
 Object.defineProperty(exports, "pgTypeToTs", { enumerable: true, get: function () { return schema_js_1.pgTypeToTs; } });
 Object.defineProperty(exports, "singularize", { enumerable: true, get: function () { return schema_js_1.singularize; } });

package/dist/cjs/introspect.js

@@ -72,13 +72,16 @@ const SQL_FOREIGN_KEYS = `
 const SQL_UNIQUE_CONSTRAINTS = `
   SELECT
     tc.table_name,
-    kcu.column_name
+    tc.constraint_name,
+    kcu.column_name,
+    kcu.ordinal_position
   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 = 'UNIQUE'
     AND tc.table_schema = $1
+  ORDER BY tc.table_name, tc.constraint_name, kcu.ordinal_position
 `;
 const SQL_INDEXES = `
   SELECT tablename, indexname, indexdef
@@ -159,14 +162,22 @@ async function introspect(options) {
             pkByTable.get(row.table_name).push(row.column_name);
         }
         // ----- Group unique constraints by table -----
+        // Group rows by (table_name, constraint_name) to correctly handle multi-column unique constraints
         const uniqueByTable = new Map();
+        const uniqueConstraintGroups = new Map();
         for (const row of uniqueResult.rows) {
             if (!tableSet.has(row.table_name))
                 continue;
-            if (!uniqueByTable.has(row.table_name))
-                uniqueByTable.set(row.table_name, []);
-            // Each unique constraint may be multi-column; for simplicity, treat as single-col here
-            uniqueByTable.get(row.table_name).push([row.column_name]);
+            const key = `${row.table_name}::${row.constraint_name}`;
+            if (!uniqueConstraintGroups.has(key)) {
+                uniqueConstraintGroups.set(key, { table: row.table_name, columns: [] });
+            }
+            uniqueConstraintGroups.get(key).columns.push(row.column_name);
+        }
+        for (const { table, columns } of uniqueConstraintGroups.values()) {
+            if (!uniqueByTable.has(table))
+                uniqueByTable.set(table, []);
+            uniqueByTable.get(table).push(columns);
         }
         // ----- Group indexes by table -----
         const indexesByTable = new Map();
@@ -193,17 +204,25 @@ async function introspect(options) {
                 enums[row.typname] = [];
             enums[row.typname].push(row.enumlabel);
         }
-        const foreignKeys = [];
+        const fkGroups = new Map();
         for (const row of fkResult.rows) {
             if (!tableSet.has(row.source_table) || !tableSet.has(row.target_table))
                 continue;
-            foreignKeys.push({
-                sourceTable: row.source_table,
-                sourceColumn: row.source_column,
-                targetTable: row.target_table,
-                targetColumn: row.target_column,
-            });
+            const key = row.constraint_name;
+            if (!fkGroups.has(key)) {
+                fkGroups.set(key, {
+                    sourceTable: row.source_table,
+                    sourceColumns: [],
+                    targetTable: row.target_table,
+                    targetColumns: [],
+                    constraintName: key,
+                });
+            }
+            const entry = fkGroups.get(key);
+            entry.sourceColumns.push(row.source_column);
+            entry.targetColumns.push(row.target_column);
         }
+        const foreignKeys = Array.from(fkGroups.values());
         // ----- Build relations from foreign keys -----
         // Count FKs per (source, target) pair for disambiguation
         const fkCounts = new Map();
@@ -215,10 +234,17 @@ async function introspect(options) {
         for (const fk of foreignKeys) {
             const pairKey = `${fk.sourceTable}→${fk.targetTable}`;
             const needsDisambiguation = (fkCounts.get(pairKey) ?? 0) > 1;
+            // For single-column FKs, keep string form for backwards compatibility.
+            // For multi-column (composite) FKs, use array form.
+            const foreignKey = fk.sourceColumns.length === 1 ? fk.sourceColumns[0] : fk.sourceColumns;
+            const referenceKey = fk.targetColumns.length === 1 ? fk.targetColumns[0] : fk.targetColumns;
             // --- belongsTo on the source (child) table ---
             // e.g. posts.user_id → users.id creates posts.user (belongsTo)
+            // For composite FKs with disambiguation, use the constraint name
             const belongsToName = needsDisambiguation
-                ? (0, schema_js_1.snakeToCamel)(fk.sourceColumn.replace(/_id$/, ''))
+                ? fk.sourceColumns.length === 1
+                    ? (0, schema_js_1.snakeToCamel)(fk.sourceColumns[0].replace(/_id$/, ''))
+                    : (0, schema_js_1.snakeToCamel)(fk.constraintName.replace(/^fk_/, '').replace(/_fkey$/, ''))
                 : (0, schema_js_1.singularize)((0, schema_js_1.snakeToCamel)(fk.targetTable));
             if (!relationsByTable.has(fk.sourceTable))
                 relationsByTable.set(fk.sourceTable, {});
@@ -227,13 +253,15 @@ async function introspect(options) {
                 name: belongsToName,
                 from: fk.sourceTable,
                 to: fk.targetTable,
-                foreignKey: fk.sourceColumn,
-                referenceKey: fk.targetColumn,
+                foreignKey,
+                referenceKey,
             };
             // --- hasMany on the target (parent) table ---
             // e.g. posts.user_id → users.id creates users.posts (hasMany)
             const hasManyName = needsDisambiguation
-                ? (0, schema_js_1.snakeToCamel)(`${fk.sourceTable}_by_${fk.sourceColumn.replace(/_id$/, '')}`)
+                ? fk.sourceColumns.length === 1
+                    ? (0, schema_js_1.snakeToCamel)(`${fk.sourceTable}_by_${fk.sourceColumns[0].replace(/_id$/, '')}`)
+                    : (0, schema_js_1.snakeToCamel)(`${fk.sourceTable}_by_${fk.constraintName.replace(/^fk_/, '').replace(/_fkey$/, '')}`)
                 : (0, schema_js_1.snakeToCamel)(fk.sourceTable);
             if (!relationsByTable.has(fk.targetTable))
                 relationsByTable.set(fk.targetTable, {});
@@ -242,8 +270,8 @@ async function introspect(options) {
                 name: hasManyName,
                 from: fk.targetTable,
                 to: fk.sourceTable,
-                foreignKey: fk.sourceColumn,
-                referenceKey: fk.targetColumn,
+                foreignKey,
+                referenceKey,
             };
         }
         // ----- Assemble TableMetadata for each table -----