bun-query-builder 0.2.20 → 0.2.22

package/dist/bin/cli.js

@@ -17890,20 +17890,23 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE t.relname = $1 AND t.relkind = 'r'
     ORDER BY i.relname, ord`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, ccu.table_name AS ref_table, ccu.column_name AS ref_column,
-            tc.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = tc.constraint_name
-                AND count_kcu.constraint_schema = tc.constraint_schema) AS constraint_column_count
+            tc.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu ON kcu.constraint_name = tc.constraint_name
       JOIN information_schema.constraint_column_usage ccu ON ccu.constraint_name = tc.constraint_name
       JOIN information_schema.referential_constraints rc ON rc.constraint_name = tc.constraint_name
     WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = $1 AND tc.table_schema = 'public'`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name);
     const existing = fkByColumn.get(name);
-    const constraintNames = Number(fk.constraint_column_count) === 1 ? [...new Set([...existing?.constraintNames ?? [], String(fk.constraint_name)])] : existing?.constraintNames;
+    const constraintName = String(fk.constraint_name);
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table),
       column: String(fk.ref_column ?? "id"),
@@ -17948,21 +17951,22 @@ async function buildMysqlTable(qb, table) {
     WHERE table_name = ? AND table_schema = DATABASE()
     ORDER BY index_name, seq_in_index`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, kcu.referenced_table_name AS ref_table, kcu.referenced_column_name AS ref_column,
-            kcu.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = kcu.constraint_name
-                AND count_kcu.constraint_schema = kcu.constraint_schema) AS constraint_column_count
+            kcu.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.key_column_usage kcu
       JOIN information_schema.referential_constraints rc
         ON rc.constraint_name = kcu.constraint_name AND rc.constraint_schema = kcu.table_schema
     WHERE kcu.table_name = ? AND kcu.table_schema = DATABASE() AND kcu.referenced_table_name IS NOT NULL`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name ?? fk.COLUMN_NAME);
     const existing = fkByColumn.get(name);
-    const columnCount = Number(fk.constraint_column_count ?? fk.CONSTRAINT_COLUMN_COUNT);
     const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
-    const constraintNames = columnCount === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table ?? fk.REF_TABLE),
       column: String(fk.ref_column ?? fk.REF_COLUMN ?? "id"),
@@ -28591,7 +28595,7 @@ function buildMigrationPlan2(models, options) {
       const column = rel.foreignKey ?? `${snakeCase(rel.model)}_id`;
       const table2 = meta.modelToTable[rel.model];
       if (table2)
-        declaredFkTargets.set(column, table2);
+        declaredFkTargets.set(column, { table: table2, onDelete: rel.onDelete });
     }
     for (const attrName of Object.keys(attrs)) {
       const attr = attrs[attrName];
@@ -28660,10 +28664,10 @@ function buildMigrationPlan2(models, options) {
           const declared = declaredFkTargets.get(columnName);
           const base = columnName.replace(/_id$/, "");
           const maybeModel = base.replace(/(^|_)([a-z])/g, (_2, __, c2) => c2.toUpperCase());
-          const refTable = declared ?? (declaresBelongsTo ? undefined : meta.modelToTable[maybeModel]);
+          const refTable = declared?.table ?? (declaresBelongsTo ? undefined : meta.modelToTable[maybeModel]);
           if (refTable) {
             const refPk = meta.primaryKeys[refTable] ?? "id";
-            col.references = { table: refTable, column: refPk };
+            col.references = { table: refTable, column: refPk, onDelete: declared?.onDelete };
           }
         }
       }
@@ -31630,7 +31634,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.20";
+var version2 = "0.2.22";
 
 // bin/cli.ts
 init_actions();

package/dist/src/index.js

@@ -17889,20 +17889,23 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE t.relname = $1 AND t.relkind = 'r'
     ORDER BY i.relname, ord`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, ccu.table_name AS ref_table, ccu.column_name AS ref_column,
-            tc.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = tc.constraint_name
-                AND count_kcu.constraint_schema = tc.constraint_schema) AS constraint_column_count
+            tc.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu ON kcu.constraint_name = tc.constraint_name
       JOIN information_schema.constraint_column_usage ccu ON ccu.constraint_name = tc.constraint_name
       JOIN information_schema.referential_constraints rc ON rc.constraint_name = tc.constraint_name
     WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = $1 AND tc.table_schema = 'public'`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name);
     const existing = fkByColumn.get(name);
-    const constraintNames = Number(fk.constraint_column_count) === 1 ? [...new Set([...existing?.constraintNames ?? [], String(fk.constraint_name)])] : existing?.constraintNames;
+    const constraintName = String(fk.constraint_name);
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table),
       column: String(fk.ref_column ?? "id"),
@@ -17947,21 +17950,22 @@ async function buildMysqlTable(qb, table) {
     WHERE table_name = ? AND table_schema = DATABASE()
     ORDER BY index_name, seq_in_index`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, kcu.referenced_table_name AS ref_table, kcu.referenced_column_name AS ref_column,
-            kcu.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = kcu.constraint_name
-                AND count_kcu.constraint_schema = kcu.constraint_schema) AS constraint_column_count
+            kcu.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.key_column_usage kcu
       JOIN information_schema.referential_constraints rc
         ON rc.constraint_name = kcu.constraint_name AND rc.constraint_schema = kcu.table_schema
     WHERE kcu.table_name = ? AND kcu.table_schema = DATABASE() AND kcu.referenced_table_name IS NOT NULL`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name ?? fk.COLUMN_NAME);
     const existing = fkByColumn.get(name);
-    const columnCount = Number(fk.constraint_column_count ?? fk.CONSTRAINT_COLUMN_COUNT);
     const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
-    const constraintNames = columnCount === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table ?? fk.REF_TABLE),
       column: String(fk.ref_column ?? fk.REF_COLUMN ?? "id"),
@@ -28590,7 +28594,7 @@ function buildMigrationPlan2(models, options) {
       const column = rel.foreignKey ?? `${snakeCase(rel.model)}_id`;
       const table2 = meta.modelToTable[rel.model];
       if (table2)
-        declaredFkTargets.set(column, table2);
+        declaredFkTargets.set(column, { table: table2, onDelete: rel.onDelete });
     }
     for (const attrName of Object.keys(attrs)) {
       const attr = attrs[attrName];
@@ -28659,10 +28663,10 @@ function buildMigrationPlan2(models, options) {
           const declared = declaredFkTargets.get(columnName);
           const base = columnName.replace(/_id$/, "");
           const maybeModel = base.replace(/(^|_)([a-z])/g, (_2, __, c2) => c2.toUpperCase());
-          const refTable = declared ?? (declaresBelongsTo ? undefined : meta.modelToTable[maybeModel]);
+          const refTable = declared?.table ?? (declaresBelongsTo ? undefined : meta.modelToTable[maybeModel]);
           if (refTable) {
             const refPk = meta.primaryKeys[refTable] ?? "id";
-            col.references = { table: refTable, column: refPk };
+            col.references = { table: refTable, column: refPk, onDelete: declared?.onDelete };
           }
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",