@bungres/kit 0.5.0 → 0.6.1

package/dist/cli.js

@@ -73,6 +73,7 @@ function createTableFactory(casing) {
 var table = createTableFactory("snake");
 var snakeCase = { table: createTableFactory("snake") };
 var camelCase = { table: createTableFactory("camel") };
+var noCasing = { table: createTableFactory("none") };
 // ../bungres-orm/src/schema/columns.ts
 function buildColumn(dataType, nameOrOpts, opts) {
   let name = "";
@@ -167,14 +168,14 @@ function sqlJoin(chunks, separator = ", ") {
 function rawSql(query) {
   return { sql: query, params: [] };
 }
-// ../bungres-orm/src/core/conditions.ts
-var colName = (c) => {
+function colName(c) {
   if (typeof c === "string")
     return `"${c}"`;
   if (isSQLChunk(c))
     return c.sql;
   return c.tableName ? `${c.tableName}."${c.name}"` : `"${c.name}"`;
-};
+}
+// ../bungres-orm/src/core/conditions.ts
 function isColumnConfig(val) {
   return val !== null && typeof val === "object" && "name" in val && "dataType" in val;
 }
@@ -231,6 +232,14 @@ var inArray = (column, values) => {
   const placeholders = params.map((_, i) => `$${i + 1}`).join(", ");
   return { sql: `${colName(column)} = ANY(ARRAY[${placeholders}])`, params };
 };
+var notInArray = (column, values) => {
+  if (values.length === 0)
+    return rawSql("TRUE");
+  const params = values;
+  const placeholders = params.map((_, i) => `$${i + 1}`).join(", ");
+  return { sql: `${colName(column)} != ALL(ARRAY[${placeholders}])`, params };
+};
+var between = (column, min, max) => sql`${rawSql(colName(column))} BETWEEN ${min} AND ${max}`;
 var and = (...conditions) => sqlJoin(conditions, " AND ");
 var or = (...conditions) => {
   const joined = sqlJoin(conditions, " OR ");
@@ -281,6 +290,10 @@ function parseWhereObject(tableConfig, whereObj) {
         conditions.push(lte(columnArg, opVal.lte));
       if (opVal.in !== undefined)
         conditions.push(inArray(columnArg, opVal.in));
+      if (opVal.notIn !== undefined)
+        conditions.push(notInArray(columnArg, opVal.notIn));
+      if (opVal.between !== undefined)
+        conditions.push(between(columnArg, opVal.between[0], opVal.between[1]));
       if (opVal.like !== undefined)
         conditions.push(like(columnArg, opVal.like));
       if (opVal.ilike !== undefined)
@@ -361,6 +374,9 @@ class DeleteBuilder {
     if (this._returning) {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(getTableConfig(this._table).columns).map((c) => `"${getTableConfig(this._table).columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${getTableConfig(this._table).columns[c]?.name ?? c}" AS "${c}"`).join(", "));
     }
+    if (this._comment) {
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
+    }
     return { sql: query, params };
   }
 }
@@ -471,7 +487,7 @@ class InsertBuilder {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(tConfig.columns).map((c) => `"${tConfig.columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${tConfig.columns[c]?.name ?? c}" AS "${c}"`).join(", "));
     }
     if (this._comment) {
-      query += ` /* ${this._comment} */`;
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
     return { sql: query, params };
   }
@@ -668,7 +684,7 @@ class SelectBuilder {
       query += ` OFFSET $${params.length}`;
     }
     if (this._comment) {
-      query += ` /* ${this._comment} */`;
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
     return { sql: query, params };
   }
@@ -768,10 +784,22 @@ class UpdateBuilder {
     if (this._returning) {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(getTableConfig(this._table).columns).map((c) => `"${getTableConfig(this._table).columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${getTableConfig(this._table).columns[c]?.name ?? c}" AS "${c}"`).join(", "));
     }
+    if (this._comment) {
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
+    }
     return { sql: query, params };
   }
 }
 // ../bungres-orm/src/builders/relational.ts
+function getPkColumn(tableConfig) {
+  if (tableConfig.primaryKeys?.length > 0)
+    return tableConfig.primaryKeys[0];
+  for (const [, col2] of Object.entries(tableConfig.columns)) {
+    if (col2.primaryKey)
+      return col2.name;
+  }
+  return "id";
+}
 var _relationsCache = new WeakMap;
 
 class RelationalQueryBuilder {
@@ -922,14 +950,17 @@ class RelationalQueryBuilder {
       if (relations.ones[relKey]) {
         const rel = relations.ones[relKey];
         const subAlias = `${alias}_${relKey}`;
-        const joinCond = `"${subAlias}"."${this._schema[rel.targetTable][TableConfigSymbol].columns.id?.name ?? "id"}" = "${alias}"."${rel.sourceColumn}"`;
+        const targetConfig = this._schema[rel.targetTable][TableConfigSymbol];
+        const targetPk = getPkColumn(targetConfig);
+        const joinCond = `"${subAlias}"."${targetPk}" = "${alias}"."${rel.sourceColumn}"`;
         const subQuery = this._buildSelectJson(rel.targetTable, rArgs, subAlias, params, alias, joinCond);
         const subSql = `SELECT ${subQuery.sql} ${subQuery.from}`;
         jsonFields.push(`'${relKey}', (${subSql})`);
       } else if (relations.manys[relKey]) {
         const rel = relations.manys[relKey];
         const subAlias = `${alias}_${relKey}`;
-        const joinCond = `"${subAlias}"."${rel.targetColumn}" = "${alias}"."${tableConfig.columns.id?.name ?? "id"}"`;
+        const thisPk = getPkColumn(tableConfig);
+        const joinCond = `"${subAlias}"."${rel.targetColumn}" = "${alias}"."${thisPk}"`;
         const subQuery = this._buildSelectJson(rel.targetTable, rArgs, subAlias, params, alias, joinCond);
         const aggAlias = `${subAlias}_agg`;
         const aggSql = `
@@ -948,9 +979,9 @@ class RelationalQueryBuilder {
         const junctionTableConfig = this._schema[rel.junctionTable][TableConfigSymbol];
         const fromExtra = `
           INNER JOIN ${junctionTableConfig.qualifiedName} AS "${junctionAlias}"
-          ON "${junctionAlias}"."${rel.joinTargetColumn}" = "${subAlias}"."${targetTableConfig.columns.id?.name ?? "id"}"
+          ON "${junctionAlias}"."${rel.joinTargetColumn}" = "${subAlias}"."${getPkColumn(targetTableConfig)}"
         `;
-        const whereExtra = `"${junctionAlias}"."${rel.joinSourceColumn}" = "${alias}"."${tableConfig.columns.id?.name ?? "id"}"`;
+        const whereExtra = `"${junctionAlias}"."${rel.joinSourceColumn}" = "${alias}"."${getPkColumn(tableConfig)}"`;
         const subQuery = this._buildSelectJson(rel.targetTable, rArgs, subAlias, params, alias, whereExtra, fromExtra);
         const aggSql = `
           SELECT COALESCE(json_agg(_sub.obj), '[]'::json)
@@ -1331,9 +1362,9 @@ function isTable(value) {
 }
 
 // src/utils/colors.ts
-function colorize(text2, color) {
+function colorize(text, color) {
   const code2 = Bun.color(color, "ansi");
-  return code2 ? `${code2}${text2}\x1B[0m` : text2;
+  return code2 ? `${code2}${text}\x1B[0m` : text;
 }
 
 // src/commands/drop.ts
@@ -1614,6 +1645,14 @@ function diffColumn(prev, next) {
   const col2 = `"${next.name}"`;
   if (prev.dataType !== next.dataType) {
     changes.push(`ALTER COLUMN ${col2} TYPE ${next.dataType.toUpperCase()} USING ${col2}::${next.dataType}`);
+  } else {
+    const prevLen = prev.length;
+    const nextLen = next.length;
+    if (prevLen !== nextLen && (next.dataType === "varchar" || next.dataType === "char")) {
+      const typeName = next.dataType === "varchar" ? "VARCHAR" : "CHAR";
+      const typeStr = nextLen ? `${typeName}(${nextLen})` : typeName;
+      changes.push(`ALTER COLUMN ${col2} TYPE ${typeStr}`);
+    }
   }
   if (!prev.notNull && next.notNull) {
     changes.push(`ALTER COLUMN ${col2} SET NOT NULL`);
@@ -1680,8 +1719,6 @@ async function runGenerate(config2, name) {
   if (isFirstMigration) {
     const sorted = topoSort(schemas2);
     statements = [
-      `CREATE EXTENSION IF NOT EXISTS "pgcrypto";`,
-      ``,
       ...sorted.flatMap((entry) => [
         `-- ${entry.exportName}`,
         generateCreateTable(entry.config, true),
@@ -2099,13 +2136,15 @@ async function runPush(config2, opts = {}) {
   }
   const sql2 = new Bun.SQL(config2.dbUrl);
   try {
+    await sql2.unsafe(`CREATE SCHEMA IF NOT EXISTS "${config2.migrationsSchema}";`);
+    const qualifiedPush = `"${config2.migrationsSchema}"."__bungres_push"`;
     await sql2.unsafe(`
-      CREATE TABLE IF NOT EXISTS public.__bungres_push (
+      CREATE TABLE IF NOT EXISTS ${qualifiedPush} (
         id SERIAL PRIMARY KEY,
         snapshot JSONB NOT NULL
       );
     `);
-    const rows = await sql2.unsafe(`SELECT snapshot FROM public.__bungres_push ORDER BY id DESC LIMIT 1;`);
+    const rows = await sql2.unsafe(`SELECT snapshot FROM ${qualifiedPush} ORDER BY id DESC LIMIT 1;`);
     let prevSnapshot = {};
     if (rows.length > 0) {
       prevSnapshot = typeof rows[0].snapshot === "string" ? JSON.parse(rows[0].snapshot) : rows[0].snapshot;
@@ -2140,14 +2179,13 @@ Are you sure you want to push these changes? Type YES to continue: `);
     }
     console.log(`
 Pushing changes...`);
-    await sql2.unsafe(`CREATE EXTENSION IF NOT EXISTS "pgcrypto";`);
     for (const stmt of diff.statements) {
       if (config2.verbose) {
         console.log(`-- ${stmt}`);
       }
       await sql2.unsafe(stmt);
     }
-    await sql2.unsafe(`INSERT INTO public.__bungres_push (snapshot) VALUES ($1);`, [JSON.stringify(currentSnapshot)]);
+    await sql2.unsafe(`INSERT INTO ${qualifiedPush} (snapshot) VALUES ($1);`, [JSON.stringify(currentSnapshot)]);
     console.log(`
 Push complete.`);
   } finally {
@@ -2281,15 +2319,32 @@ async function runStudio(config2) {
     async fetch(req) {
       const url = new URL(req.url);
       if (req.method === "GET" && url.pathname === "/api/tables") {
-        const tables = schemas2.map((s) => ({
-          name: s.config.name,
-          exportName: s.exportName,
-          columns: Object.entries(s.config.columns).map(([key, col2]) => ({
-            name: col2.name,
-            type: col2.dataType,
-            primaryKey: col2.primaryKey
-          }))
-        }));
+        const tables = schemas2.map((s) => {
+          const fkColumns = new Set;
+          if (s.config.foreignKeys) {
+            s.config.foreignKeys.forEach((fk) => {
+              fk.columns.forEach((col2) => fkColumns.add(col2));
+            });
+          }
+          const columns2 = Object.entries(s.config.columns).map(([key, col2]) => {
+            const fk = col2.references ? {
+              table: col2.references.table,
+              column: col2.references.column
+            } : fkColumns.has(col2.name) ? { isForeignKey: true } : null;
+            return {
+              name: col2.name,
+              type: col2.dataType,
+              primaryKey: col2.primaryKey,
+              foreignKey: fk
+            };
+          });
+          return {
+            name: s.config.name,
+            exportName: s.exportName,
+            columns: columns2,
+            foreignKeys: s.config.foreignKeys || []
+          };
+        });
         return new Response(JSON.stringify(tables), {
           headers: { "Content-Type": "application/json" }
         });
@@ -2367,15 +2422,16 @@ var htmlTemplate = `
   <style>
     :root {
       --bg-color: #09090b;
-      --panel-bg: rgba(24, 24, 27, 0.7);
+      --panel-bg: #18181b;
       --border-color: #27272a;
-      --text-main: #f4f4f5;
+      --text-main: #fafafa;
       --text-muted: #a1a1aa;
       --accent-color: #8b5cf6;
       --accent-hover: #7c3aed;
-      --header-bg: rgba(9, 9, 11, 0.85);
-      --row-hover: rgba(39, 39, 42, 0.8);
-      --glass-border: rgba(255, 255, 255, 0.08);
+      --header-bg: #09090b;
+      --row-hover: #27272a;
+      --input-bg: #18181b;
+      --muted-bg: #27272a;
       
       --type-number: #f472b6;
       --type-string: #60a5fa;
@@ -2400,45 +2456,39 @@ var htmlTemplate = `
 
     /* Sidebar */
     .sidebar {
-      width: 280px;
+      width: 240px;
       background-color: var(--panel-bg);
-      backdrop-filter: blur(12px);
-      -webkit-backdrop-filter: blur(12px);
       border-right: 1px solid var(--border-color);
       display: flex;
       flex-direction: column;
-      box-shadow: 4px 0 24px rgba(0,0,0,0.2);
       z-index: 20;
     }
 
     .sidebar-header {
-      padding: 24px;
-      border-bottom: 1px solid var(--glass-border);
+      padding: 16px;
+      border-bottom: 1px solid var(--border-color);
       display: flex;
       align-items: center;
-      gap: 12px;
-      background: linear-gradient(to bottom, rgba(255,255,255,0.03), transparent);
+      gap: 8px;
+      background-color: var(--panel-bg);
     }
 
     .sidebar-header h1 {
       margin: 0;
-      font-size: 18px;
+      font-size: 14px;
       font-weight: 600;
-      background: linear-gradient(to right, #fff, #a1a1aa);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-      letter-spacing: -0.5px;
+      color: var(--text-main);
+      letter-spacing: -0.25px;
     }
 
     .sidebar-header svg {
       color: var(--accent-color);
-      filter: drop-shadow(0 0 8px rgba(139, 92, 246, 0.5));
     }
 
     .table-list {
       flex: 1;
       overflow-y: auto;
-      padding: 16px 12px;
+      padding: 8px;
       list-style: none;
       margin: 0;
     }
@@ -2452,39 +2502,36 @@ var htmlTemplate = `
     }
 
     .table-item {
-      padding: 12px 16px;
+      padding: 8px 12px;
       cursor: pointer;
-      font-size: 15px;
+      font-size: 13px;
       font-weight: 500;
       color: var(--text-muted);
-      border-radius: 8px;
-      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      border-radius: 6px;
+      transition: all 0.15s ease;
       display: flex;
       align-items: center;
-      gap: 10px;
-      margin-bottom: 4px;
+      gap: 8px;
+      margin-bottom: 2px;
       border: 1px solid transparent;
     }
 
     .table-item:hover {
-      background-color: rgba(255, 255, 255, 0.05);
+      background-color: var(--muted-bg);
       color: var(--text-main);
-      transform: translateX(4px);
     }
 
     .table-item.active {
-      background-color: rgba(139, 92, 246, 0.15);
+      background-color: var(--accent-color);
       color: #fff;
-      border: 1px solid rgba(139, 92, 246, 0.3);
-      box-shadow: 0 4px 12px rgba(139, 92, 246, 0.1);
+      border-color: var(--accent-color);
     }
 
     .table-item svg {
-      transition: transform 0.3s ease;
+      flex-shrink: 0;
     }
     .table-item.active svg {
-      color: var(--accent-color);
-      transform: scale(1.1);
+      color: #fff;
     }
 
     /* Main Content */
@@ -2496,31 +2543,29 @@ var htmlTemplate = `
     }
 
     .main-header {
-      height: 70px;
-      padding: 0 24px;
+      height: 56px;
+      padding: 0 16px;
       border-bottom: 1px solid var(--border-color);
       display: flex;
       align-items: center;
       justify-content: space-between;
       background-color: var(--header-bg);
-      backdrop-filter: blur(12px);
-      -webkit-backdrop-filter: blur(12px);
       z-index: 10;
     }
 
     .main-header h2 {
       margin: 0;
-      font-size: 20px;
+      font-size: 14px;
       font-weight: 600;
-      color: white;
-      letter-spacing: -0.5px;
+      color: var(--text-main);
+      letter-spacing: -0.25px;
       display: flex;
       align-items: center;
-      gap: 10px;
+      gap: 8px;
     }
 
     .btn {
-      background-color: rgba(255, 255, 255, 0.05);
+      background-color: var(--input-bg);
       border: 1px solid var(--border-color);
       color: var(--text-main);
       padding: 6px 12px;
@@ -2529,14 +2574,14 @@ var htmlTemplate = `
       font-weight: 500;
       font-family: 'Outfit', sans-serif;
       cursor: pointer;
-      transition: all 0.2s ease;
+      transition: all 0.15s ease;
       display: flex;
       align-items: center;
-      gap: 8px;
+      gap: 6px;
     }
 
     .btn:hover:not(:disabled) {
-      background-color: rgba(255, 255, 255, 0.1);
+      background-color: var(--muted-bg);
     }
     
     .btn:active:not(:disabled) {
@@ -2544,7 +2589,7 @@ var htmlTemplate = `
     }
 
     .btn:disabled {
-      opacity: 0.4;
+      opacity: 0.5;
       cursor: not-allowed;
     }
 
@@ -2559,14 +2604,20 @@ var htmlTemplate = `
 
     /* Data Table */
     .data-grid-container {
-      background-color: rgba(24, 24, 27, 0.5);
+      background-color: var(--bg-color);
       border: 1px solid var(--border-color);
       border-radius: 0;
-      overflow: auto;
-      box-shadow: 0 8px 32px rgba(0,0,0,0.2);
-      backdrop-filter: blur(8px);
-      max-height: 100%;
+      overflow: hidden;
+      height: 100%;
       width: 100%;
+      display: flex;
+      flex-direction: column;
+    }
+    
+    .data-grid-container > .table-wrapper {
+      flex: 1;
+      overflow: auto;
+      min-height: 0;
     }
     
     .data-grid-container::-webkit-scrollbar {
@@ -2581,6 +2632,7 @@ var htmlTemplate = `
       border-radius: 4px;
     }
 
+
     table {
       width: auto;
       border-collapse: separate;
@@ -2591,11 +2643,11 @@ var htmlTemplate = `
     }
 
     th {
-      background-color: rgba(24, 24, 27, 0.95);
-      backdrop-filter: blur(4px);
+      background-color: var(--panel-bg);
       color: var(--text-main);
       font-weight: 500;
-      padding: 12px 20px;
+      font-size: 12px;
+      padding: 10px 16px;
       border-bottom: 1px solid var(--border-color);
       border-right: 1px solid var(--border-color);
       white-space: nowrap;
@@ -2603,24 +2655,16 @@ var htmlTemplate = `
       top: 0;
       z-index: 10;
     }
-    
-    
-    th::after {
-      content: '';
-      position: absolute;
-      bottom: -1px; left: 0; right: 0;
-      height: 1px;
-      background: var(--border-color);
-    }
 
     .col-header {
       display: flex;
       flex-direction: column;
-      gap: 4px;
+      gap: 2px;
     }
     
     .col-name {
       font-weight: 600;
+      font-size: 13px;
       display: flex;
       align-items: center;
       gap: 6px;
@@ -2628,22 +2672,35 @@ var htmlTemplate = `
 
     .pk-badge {
       font-size: 10px;
-      background: rgba(251, 191, 36, 0.2);
+      background: rgba(251, 191, 36, 0.15);
       color: #fbbf24;
-      padding: 2px 6px;
+      padding: 2px 5px;
       border-radius: 4px;
-      font-weight: 600;
-      letter-spacing: 0.5px;
+      font-weight: 500;
+      letter-spacing: 0.25px;
+      border: 1px solid rgba(251, 191, 36, 0.3);
+    }
+
+    .fk-badge {
+      font-size: 10px;
+      background: rgba(96, 165, 250, 0.15);
+      color: #60a5fa;
+      padding: 2px 5px;
+      border-radius: 4px;
+      font-weight: 500;
+      letter-spacing: 0.25px;
+      border: 1px solid rgba(96, 165, 250, 0.3);
     }
     
     .col-type {
-      font-size: 12px;
+      font-size: 11px;
       color: var(--text-muted);
-      font-family: monospace;
+      font-family: 'JetBrains Mono', 'Fira Code', monospace;
+      text-transform: uppercase;
     }
 
     td {
-      padding: 12px 20px;
+      padding: 10px 16px;
       border-bottom: 1px solid var(--border-color);
       border-right: 1px solid var(--border-color);
       color: var(--text-main);
@@ -2651,13 +2708,11 @@ var htmlTemplate = `
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      transition: background-color 0.2s ease;
+      transition: background-color 0.15s ease;
+      font-size: 13px;
     }
     
 
-    tr:last-child td {
-      border-bottom: none;
-    }
 
     tr:hover td {
       background-color: var(--row-hover);
@@ -2717,45 +2772,45 @@ var htmlTemplate = `
       display: flex;
       align-items: center;
       justify-content: space-between;
-      padding: 16px 24px;
-      background-color: rgba(24, 24, 27, 0.95);
+      padding: 12px 16px;
+      background-color: var(--panel-bg);
       border-top: 1px solid var(--border-color);
-      font-size: 14px;
+      font-size: 13px;
       color: var(--text-muted);
-      position: sticky;
-      bottom: 0;
-      z-index: 5;
+      width: fit-content;
+      min-width: 100%;
+      flex-shrink: 0;
     }
 
     .pagination-info {
       display: flex;
       align-items: center;
-      gap: 16px;
+      gap: 12px;
     }
 
     .pagination-controls {
       display: flex;
       align-items: center;
-      gap: 8px;
+      gap: 6px;
     }
 
     .pagination-btn {
-      background-color: rgba(255, 255, 255, 0.05);
+      background-color: var(--input-bg);
       border: 1px solid var(--border-color);
       color: var(--text-main);
       padding: 6px 12px;
       border-radius: 6px;
       cursor: pointer;
       font-size: 13px;
-      transition: all 0.2s ease;
+      transition: all 0.15s ease;
     }
 
     .pagination-btn:hover:not(:disabled) {
-      background-color: rgba(255, 255, 255, 0.1);
+      background-color: var(--muted-bg);
     }
 
     .pagination-btn:disabled {
-      opacity: 0.4;
+      opacity: 0.5;
       cursor: not-allowed;
     }
 
@@ -2765,7 +2820,7 @@ var htmlTemplate = `
     }
 
     .page-input {
-      background-color: rgba(255, 255, 255, 0.05);
+      background-color: var(--input-bg);
       border: 1px solid var(--border-color);
       color: var(--text-main);
       padding: 6px 8px;
@@ -2774,6 +2829,20 @@ var htmlTemplate = `
       text-align: center;
       font-size: 13px;
     }
+
+    .page-size-select {
+      background-color: var(--input-bg);
+      border: 1px solid var(--border-color);
+      color: var(--text-main);
+      padding: 6px 8px;
+      border-radius: 6px;
+      font-size: 13px;
+      cursor: pointer;
+    }
+
+    .page-size-select:hover {
+      background-color: var(--muted-bg);
+    }
   </style>
 </head>
 <body>
@@ -2830,7 +2899,7 @@ var htmlTemplate = `
     let currentPage = 1;
     let totalPages = 1;
     let totalRecords = 0;
-    let pageSize = 50;
+    let pageSize = 25;
 
     // Format values for the data grid
     function formatValue(val) {
@@ -2910,21 +2979,29 @@ var htmlTemplate = `
       document.getElementById('refresh-btn').disabled = false;
       
       const container = document.getElementById('data-container');
-      container.innerHTML = \`
-        <div class="empty-state">
-          <svg class="spinning" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <line x1="12" y1="2" x2="12" y2="6"></line>
-            <line x1="12" y1="18" x2="12" y2="22"></line>
-            <line x1="4.93" y1="4.93" x2="7.76" y2="7.76"></line>
-            <line x1="16.24" y1="16.24" x2="19.07" y2="19.07"></line>
-            <line x1="2" y1="12" x2="6" y2="12"></line>
-            <line x1="18" y1="12" x2="22" y2="12"></line>
-            <line x1="4.93" y1="19.07" x2="7.76" y2="16.24"></line>
-            <line x1="16.24" y1="7.76" x2="19.07" y2="4.93"></line>
-          </svg>
-          <p>Loading data...</p>
-        </div>
-      \`;
+      const existingTable = container.querySelector('.data-grid-container');
+      
+      if (existingTable) {
+        // Show loading overlay instead of replacing content
+        existingTable.style.opacity = '0.5';
+        existingTable.style.pointerEvents = 'none';
+      } else {
+        container.innerHTML = \`
+          <div class="empty-state">
+            <svg class="spinning" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+              <line x1="12" y1="2" x2="12" y2="6"></line>
+              <line x1="12" y1="18" x2="12" y2="22"></line>
+              <line x1="4.93" y1="4.93" x2="7.76" y2="7.76"></line>
+              <line x1="16.24" y1="16.24" x2="19.07" y2="19.07"></line>
+              <line x1="2" y1="12" x2="6" y2="12"></line>
+              <line x1="18" y1="12" x2="22" y2="12"></line>
+              <line x1="4.93" y1="19.07" x2="7.76" y2="16.24"></line>
+              <line x1="16.24" y1="7.76" x2="19.07" y2="4.93"></line>
+            </svg>
+            <p>Loading data...</p>
+          </div>
+        \`;
+      }
       
       try {
         const res = await fetch(\`/api/tables/\${name}/data?page=\${page}&limit=\${pageSize}\`);
@@ -2967,13 +3044,32 @@ var htmlTemplate = `
           });
         }
         
-        columns = Array.from(allKeys).map(key => ({
-          name: key,
-          type: schemaColMap[key] ? schemaColMap[key].type : typeof rows[0][key],
-          primaryKey: schemaColMap[key] ? schemaColMap[key].primaryKey : false
-        }));
+        columns = Array.from(allKeys).map(key => {
+          const schemaCol = schemaColMap[key];
+          let type = 'text';
+          
+          // First try to get type from schema
+          if (schemaCol && schemaCol.type) {
+            type = schemaCol.type;
+          } else if (rows[0] && rows[0][key] !== undefined) {
+            // Fallback to type detection from actual value
+            const val = rows[0][key];
+            if (typeof val === 'number') type = 'integer';
+            else if (typeof val === 'boolean') type = 'boolean';
+            else if (val instanceof Date) type = 'timestamptz';
+            else if (typeof val === 'string' && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(val)) type = 'uuid';
+            else type = 'text';
+          }
+          
+          return {
+            name: key,
+            type,
+            primaryKey: schemaCol ? schemaCol.primaryKey : false,
+            foreignKey: schemaCol ? schemaCol.foreignKey : null
+          };
+        });
         
-        let html = '<div class="data-grid-container"><table><thead><tr>';
+        let html = '<div class="data-grid-container"><div class="table-wrapper"><table><thead><tr>';
         columns.forEach(col => {
           html += \`
             <th>
@@ -2981,6 +3077,7 @@ var htmlTemplate = `
                 <div class="col-name">
                   \${col.name}
                   \${col.primaryKey ? '<span class="pk-badge">PK</span>' : ''}
+                  \${col.foreignKey ? '<span class="fk-badge">FK</span>' : ''}
                 </div>
                 <div class="col-type">\${col.type}</div>
               </div>
@@ -2999,12 +3096,22 @@ var htmlTemplate = `
         
         html += '</tbody></table>';
         
-        // Add pagination
+        // Add pagination inside the table wrapper to match table width
         html += renderPagination();
         
-        html += '</div>';
+        html += '</div></div>';
         container.innerHTML = html;
         
+        // Fade in the new content
+        const newTable = container.querySelector('.data-grid-container');
+        if (newTable) {
+          newTable.style.opacity = '0';
+          requestAnimationFrame(() => {
+            newTable.style.transition = 'opacity 0.15s ease';
+            newTable.style.opacity = '1';
+          });
+        }
+        
       } catch (e) {
         container.innerHTML = \`
           <div class="empty-state">
@@ -3026,18 +3133,27 @@ var htmlTemplate = `
       
       let html = '<div class="pagination">';
       html += '<div class="pagination-info">';
-      html += \`<span>Total: \${totalRecords} records</span>\`;
-      html += \`<span>Page \${currentPage} of \${totalPages}</span>\`;
-      html += \`<span>Showing \${startRecord}-\${endRecord}</span>\`;
+      html += \`<span>\${totalRecords} records</span>\`;
+      html += \`<span>\${startRecord}-\${endRecord}</span>\`;
       html += '</div>';
       
       html += '<div class="pagination-controls">';
       
+      // Page size selector
+      html += '<select class="page-size-select" onchange="changePageSize(this.value)">';
+      [10, 25, 50, 100].forEach(size => {
+        html += \`<option value="\${size}" \${pageSize === size ? 'selected' : ''}>\${size}</option>\`;
+      });
+      html += '</select>';
+      
       // Previous button
-      html += \`<button class="pagination-btn" onclick="changePage(\${currentPage - 1})" \${currentPage === 1 ? 'disabled' : ''}>Previous</button>\`;
+      html += \`<button class="pagination-btn" onclick="changePage(\${currentPage - 1})" \${currentPage === 1 ? 'disabled' : ''}>\u2190</button>\`;
+      
+      // Page indicator
+      html += \`<span style="min-width: 60px; text-align: center;">\${currentPage} / \${totalPages}</span>\`;
       
       // Next button
-      html += \`<button class="pagination-btn" onclick="changePage(\${currentPage + 1})" \${currentPage === totalPages ? 'disabled' : ''}>Next</button>\`;
+      html += \`<button class="pagination-btn" onclick="changePage(\${currentPage + 1})" \${currentPage === totalPages ? 'disabled' : ''}>\u2192</button>\`;
       
       html += '</div>';
       html += '</div>';
@@ -3045,6 +3161,12 @@ var htmlTemplate = `
       return html;
     }
 
+    function changePageSize(newSize) {
+      pageSize = parseInt(newSize, 10);
+      currentPage = 1;
+      selectTable(currentTable, currentPage);
+    }
+
     function changePage(page) {
       if (page < 1 || page > totalPages) return;
       selectTable(currentTable, page);
@@ -3172,7 +3294,7 @@ async function loadConfig(cwd = process.cwd()) {
     migrationsSchema: userConfig.migrations?.schema ?? "bungres",
     breakpoints: userConfig.breakpoints ?? true,
     strict: userConfig.strict ?? false,
-    outDir: "./src/db/generated",
+    outDir: userConfig.outDir ?? "./src/db/generated",
     verbose: userConfig.verbose ?? false
   };
 }
@@ -3189,6 +3311,9 @@ async function ensureDatabase2(dbUrl) {
       try {
         const parsed = new URL(dbUrl);
         const dbName = parsed.pathname.slice(1);
+        if (!/^[a-zA-Z_][a-zA-Z0-9_$]*$/.test(dbName)) {
+          throw new Error(`Invalid database name: "${dbName}"`);
+        }
         parsed.pathname = "/postgres";
         const fallbackUrl = parsed.toString();
         const fallback = new Bun.SQL(fallbackUrl);
@@ -3206,9 +3331,69 @@ async function ensureDatabase2(dbUrl) {
     }
   }
 }
+// package.json
+var package_default = {
+  name: "@bungres/kit",
+  version: "0.6.1",
+  description: "CLI toolkit for @bungres/orm \u2014 migrate, push, generate, pull",
+  license: "MIT",
+  engines: {
+    node: ">=24.0.0",
+    bun: ">=1.3.0"
+  },
+  type: "module",
+  bin: {
+    bungres: "./dist/cli.js"
+  },
+  main: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      bun: "./src/index.ts",
+      import: "./dist/index.js",
+      types: "./dist/index.d.ts"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  author: "aniket khote",
+  repository: {
+    type: "git",
+    url: "https://github.com/bungres/bungres.git",
+    directory: "packages/bungres-kit"
+  },
+  bugs: {
+    url: "https://github.com/bungres/bungres/issues"
+  },
+  homepage: "https://github.com/bungres/bungres#readme",
+  keywords: [
+    "bun",
+    "postgres",
+    "orm",
+    "cli",
+    "migration",
+    "generator"
+  ],
+  scripts: {
+    "build:types": "tsc --emitDeclarationOnly",
+    build: "bun build ./src/cli.ts ./src/index.ts --outdir ./dist --target bun --format esm && npm run build:types",
+    dev: "bun --watch src/cli.ts",
+    test: "bun test"
+  },
+  dependencies: {
+    "@bungres/orm": "workspace:*"
+  },
+  devDependencies: {
+    "bun-types": "latest",
+    typescript: "latest"
+  }
+};
 
 // src/cli.ts
-var VERSION = "0.0.1";
+var VERSION = package_default.version;
 var HELP = `
 ${colorize("\uD83D\uDC18 Bungres ORM CLI", "cyan")} v${VERSION}
 

package/dist/commands/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAgBnD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAgGf"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAgBnD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CA+Ff"}

package/dist/commands/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAUnD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7B,OAAO,CAAC,IAAI,CAAC,CAoFf"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAUnD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7B,OAAO,CAAC,IAAI,CAAC,CAqFf"}

package/dist/commands/studio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"studio.d.ts","sourceRoot":"","sources":["../../src/commands/studio.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAoHrE"}
+{"version":3,"file":"studio.d.ts","sourceRoot":"","sources":["../../src/commands/studio.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAQnD,wBAAsB,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAyIrE"}

package/dist/config.d.ts

@@ -53,6 +53,11 @@ export interface BungresKitConfig {
      * Default: false
      */
     strict?: boolean;
+    /**
+     * Output directory for `bungres pull` generated TypeScript.
+     * Default: "./src/db/generated"
+     */
+    outDir?: string;
     /** Print every SQL statement executed. Default: false */
     verbose?: boolean;
 }

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE1B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,aAAa,CAAC,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IAEF;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE;QACX;;;WAGG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AASD,wBAAsB,UAAU,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CA0C7E"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE1B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,aAAa,CAAC,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IAEF;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE;QACX;;;WAGG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AASD,wBAAsB,UAAU,CAAC,GAAG,SAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CA0C7E"}

package/dist/ensure-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-db.d.ts","sourceRoot":"","sources":["../src/ensure-db.ts"],"names":[],"mappings":"AAAA,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BjE"}
+{"version":3,"file":"ensure-db.d.ts","sourceRoot":"","sources":["../src/ensure-db.ts"],"names":[],"mappings":"AAAA,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCjE"}

package/dist/index.js

@@ -34,7 +34,7 @@ async function loadConfig(cwd = process.cwd()) {
     migrationsSchema: userConfig.migrations?.schema ?? "bungres",
     breakpoints: userConfig.breakpoints ?? true,
     strict: userConfig.strict ?? false,
-    outDir: "./src/db/generated",
+    outDir: userConfig.outDir ?? "./src/db/generated",
     verbose: userConfig.verbose ?? false
   };
 }
@@ -110,6 +110,7 @@ function createTableFactory(casing) {
 var table = createTableFactory("snake");
 var snakeCase = { table: createTableFactory("snake") };
 var camelCase = { table: createTableFactory("camel") };
+var noCasing = { table: createTableFactory("none") };
 // ../bungres-orm/src/schema/columns.ts
 function buildColumn(dataType, nameOrOpts, opts) {
   let name = "";
@@ -204,14 +205,14 @@ function sqlJoin(chunks, separator = ", ") {
 function rawSql(query) {
   return { sql: query, params: [] };
 }
-// ../bungres-orm/src/core/conditions.ts
-var colName = (c) => {
+function colName(c) {
   if (typeof c === "string")
     return `"${c}"`;
   if (isSQLChunk(c))
     return c.sql;
   return c.tableName ? `${c.tableName}."${c.name}"` : `"${c.name}"`;
-};
+}
+// ../bungres-orm/src/core/conditions.ts
 function isColumnConfig(val) {
   return val !== null && typeof val === "object" && "name" in val && "dataType" in val;
 }
@@ -268,6 +269,14 @@ var inArray = (column, values) => {
   const placeholders = params.map((_, i) => `$${i + 1}`).join(", ");
   return { sql: `${colName(column)} = ANY(ARRAY[${placeholders}])`, params };
 };
+var notInArray = (column, values) => {
+  if (values.length === 0)
+    return rawSql("TRUE");
+  const params = values;
+  const placeholders = params.map((_, i) => `$${i + 1}`).join(", ");
+  return { sql: `${colName(column)} != ALL(ARRAY[${placeholders}])`, params };
+};
+var between = (column, min, max) => sql`${rawSql(colName(column))} BETWEEN ${min} AND ${max}`;
 var and = (...conditions) => sqlJoin(conditions, " AND ");
 var or = (...conditions) => {
   const joined = sqlJoin(conditions, " OR ");
@@ -318,6 +327,10 @@ function parseWhereObject(tableConfig, whereObj) {
         conditions.push(lte(columnArg, opVal.lte));
       if (opVal.in !== undefined)
         conditions.push(inArray(columnArg, opVal.in));
+      if (opVal.notIn !== undefined)
+        conditions.push(notInArray(columnArg, opVal.notIn));
+      if (opVal.between !== undefined)
+        conditions.push(between(columnArg, opVal.between[0], opVal.between[1]));
       if (opVal.like !== undefined)
         conditions.push(like(columnArg, opVal.like));
       if (opVal.ilike !== undefined)
@@ -398,6 +411,9 @@ class DeleteBuilder {
     if (this._returning) {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(getTableConfig(this._table).columns).map((c) => `"${getTableConfig(this._table).columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${getTableConfig(this._table).columns[c]?.name ?? c}" AS "${c}"`).join(", "));
     }
+    if (this._comment) {
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
+    }
     return { sql: query, params };
   }
 }
@@ -508,7 +524,7 @@ class InsertBuilder {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(tConfig.columns).map((c) => `"${tConfig.columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${tConfig.columns[c]?.name ?? c}" AS "${c}"`).join(", "));
     }
     if (this._comment) {
-      query += ` /* ${this._comment} */`;
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
     return { sql: query, params };
   }
@@ -705,7 +721,7 @@ class SelectBuilder {
       query += ` OFFSET $${params.length}`;
     }
     if (this._comment) {
-      query += ` /* ${this._comment} */`;
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
     }
     return { sql: query, params };
   }
@@ -805,10 +821,22 @@ class UpdateBuilder {
     if (this._returning) {
       query += " RETURNING " + (this._returning[0] === "*" ? Object.keys(getTableConfig(this._table).columns).map((c) => `"${getTableConfig(this._table).columns[c].name}" AS "${c}"`).join(", ") : this._returning.map((c) => `"${getTableConfig(this._table).columns[c]?.name ?? c}" AS "${c}"`).join(", "));
     }
+    if (this._comment) {
+      query += ` /* ${this._comment.replace(/\*\//g, "")} */`;
+    }
     return { sql: query, params };
   }
 }
 // ../bungres-orm/src/builders/relational.ts
+function getPkColumn(tableConfig) {
+  if (tableConfig.primaryKeys?.length > 0)
+    return tableConfig.primaryKeys[0];
+  for (const [, col2] of Object.entries(tableConfig.columns)) {
+    if (col2.primaryKey)
+      return col2.name;
+  }
+  return "id";
+}
 var _relationsCache = new WeakMap;
 
 class RelationalQueryBuilder {
@@ -959,14 +987,17 @@ class RelationalQueryBuilder {
       if (relations.ones[relKey]) {
         const rel = relations.ones[relKey];
         const subAlias = `${alias}_${relKey}`;
-        const joinCond = `"${subAlias}"."${this._schema[rel.targetTable][TableConfigSymbol].columns.id?.name ?? "id"}" = "${alias}"."${rel.sourceColumn}"`;
+        const targetConfig = this._schema[rel.targetTable][TableConfigSymbol];
+        const targetPk = getPkColumn(targetConfig);
+        const joinCond = `"${subAlias}"."${targetPk}" = "${alias}"."${rel.sourceColumn}"`;
         const subQuery = this._buildSelectJson(rel.targetTable, rArgs, subAlias, params, alias, joinCond);
         const subSql = `SELECT ${subQuery.sql} ${subQuery.from}`;
         jsonFields.push(`'${relKey}', (${subSql})`);
       } else if (relations.manys[relKey]) {
         const rel = relations.manys[relKey];
         const subAlias = `${alias}_${relKey}`;
-        const joinCond = `"${subAlias}"."${rel.targetColumn}" = "${alias}"."${tableConfig.columns.id?.name ?? "id"}"`;
+        const thisPk = getPkColumn(tableConfig);
+        const joinCond = `"${subAlias}"."${rel.targetColumn}" = "${alias}"."${thisPk}"`;
         const subQuery = this._buildSelectJson(rel.targetTable, rArgs, subAlias, params, alias, joinCond);
         const aggAlias = `${subAlias}_agg`;
         const aggSql = `
@@ -985,9 +1016,9 @@ class RelationalQueryBuilder {
         const junctionTableConfig = this._schema[rel.junctionTable][TableConfigSymbol];
         const fromExtra = `
           INNER JOIN ${junctionTableConfig.qualifiedName} AS "${junctionAlias}"
-          ON "${junctionAlias}"."${rel.joinTargetColumn}" = "${subAlias}"."${targetTableConfig.columns.id?.name ?? "id"}"
+          ON "${junctionAlias}"."${rel.joinTargetColumn}" = "${subAlias}"."${getPkColumn(targetTableConfig)}"
         `;
-        const whereExtra = `"${junctionAlias}"."${rel.joinSourceColumn}" = "${alias}"."${tableConfig.columns.id?.name ?? "id"}"`;
+        const whereExtra = `"${junctionAlias}"."${rel.joinSourceColumn}" = "${alias}"."${getPkColumn(tableConfig)}"`;
         const subQuery = this._buildSelectJson(rel.targetTable, rArgs, subAlias, params, alias, whereExtra, fromExtra);
         const aggSql = `
           SELECT COALESCE(json_agg(_sub.obj), '[]'::json)
@@ -1500,6 +1531,14 @@ function diffColumn(prev, next) {
   const col2 = `"${next.name}"`;
   if (prev.dataType !== next.dataType) {
     changes.push(`ALTER COLUMN ${col2} TYPE ${next.dataType.toUpperCase()} USING ${col2}::${next.dataType}`);
+  } else {
+    const prevLen = prev.length;
+    const nextLen = next.length;
+    if (prevLen !== nextLen && (next.dataType === "varchar" || next.dataType === "char")) {
+      const typeName = next.dataType === "varchar" ? "VARCHAR" : "CHAR";
+      const typeStr = nextLen ? `${typeName}(${nextLen})` : typeName;
+      changes.push(`ALTER COLUMN ${col2} TYPE ${typeStr}`);
+    }
   }
   if (!prev.notNull && next.notNull) {
     changes.push(`ALTER COLUMN ${col2} SET NOT NULL`);
@@ -1544,13 +1583,15 @@ async function runPush(config, opts = {}) {
   }
   const sql2 = new Bun.SQL(config.dbUrl);
   try {
+    await sql2.unsafe(`CREATE SCHEMA IF NOT EXISTS "${config.migrationsSchema}";`);
+    const qualifiedPush = `"${config.migrationsSchema}"."__bungres_push"`;
     await sql2.unsafe(`
-      CREATE TABLE IF NOT EXISTS public.__bungres_push (
+      CREATE TABLE IF NOT EXISTS ${qualifiedPush} (
         id SERIAL PRIMARY KEY,
         snapshot JSONB NOT NULL
       );
     `);
-    const rows = await sql2.unsafe(`SELECT snapshot FROM public.__bungres_push ORDER BY id DESC LIMIT 1;`);
+    const rows = await sql2.unsafe(`SELECT snapshot FROM ${qualifiedPush} ORDER BY id DESC LIMIT 1;`);
     let prevSnapshot = {};
     if (rows.length > 0) {
       prevSnapshot = typeof rows[0].snapshot === "string" ? JSON.parse(rows[0].snapshot) : rows[0].snapshot;
@@ -1585,14 +1626,13 @@ Are you sure you want to push these changes? Type YES to continue: `);
     }
     console.log(`
 Pushing changes...`);
-    await sql2.unsafe(`CREATE EXTENSION IF NOT EXISTS "pgcrypto";`);
     for (const stmt of diff.statements) {
       if (config.verbose) {
         console.log(`-- ${stmt}`);
       }
       await sql2.unsafe(stmt);
     }
-    await sql2.unsafe(`INSERT INTO public.__bungres_push (snapshot) VALUES ($1);`, [JSON.stringify(currentSnapshot)]);
+    await sql2.unsafe(`INSERT INTO ${qualifiedPush} (snapshot) VALUES ($1);`, [JSON.stringify(currentSnapshot)]);
     console.log(`
 Push complete.`);
   } finally {
@@ -1608,9 +1648,9 @@ async function readLine() {
 import { join as join3, resolve as resolve3 } from "path";
 
 // src/utils/colors.ts
-function colorize(text2, color) {
+function colorize(text, color) {
   const code = Bun.color(color, "ansi");
-  return code ? `${code}${text2}\x1B[0m` : text2;
+  return code ? `${code}${text}\x1B[0m` : text;
 }
 
 // src/commands/generate.ts
@@ -1645,8 +1685,6 @@ async function runGenerate(config, name) {
   if (isFirstMigration) {
     const sorted = topoSort(schemas);
     statements = [
-      `CREATE EXTENSION IF NOT EXISTS "pgcrypto";`,
-      ``,
       ...sorted.flatMap((entry) => [
         `-- ${entry.exportName}`,
         generateCreateTable(entry.config, true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bungres/kit",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "CLI toolkit for @bungres/orm — migrate, push, generate, pull",
   "license": "MIT",
   "engines": {