@bungres/kit 0.1.0 → 0.3.0

package/dist/cli.js

@@ -41,7 +41,7 @@ async function loadConfig(cwd = process.cwd()) {
 // src/commands/push.ts
 import * as fs from "fs";
 
-// ../bungres-orm/src/table.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/table.ts
 var TableConfigSymbol = Symbol.for("BungresTableConfig");
 function getTableConfig(table) {
   return table[TableConfigSymbol];
@@ -81,7 +81,7 @@ function createTableFactory(casing) {
 var table = createTableFactory("none");
 var snakeCase = { table: createTableFactory("snake") };
 var camelCase = { table: createTableFactory("camel") };
-// ../bungres-orm/src/column.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/column.ts
 function buildColumn(dataType, nameOrOpts, opts) {
   let name = "";
   let options = opts;
@@ -135,7 +135,7 @@ var interval = col("interval");
 var inet = col("inet");
 var cidr = col("cidr");
 var macaddr = col("macaddr");
-// ../bungres-orm/src/sql.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/sql.ts
 function sqlJoin(chunks, separator = ", ") {
   const params = [];
   const parts = [];
@@ -146,7 +146,7 @@ function sqlJoin(chunks, separator = ", ") {
   }
   return { sql: parts.join(separator), params };
 }
-// ../bungres-orm/src/query.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/query.ts
 class SelectBuilder {
   _table;
   _executor;
@@ -166,6 +166,9 @@ class SelectBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   select(...columns) {
     this._select = columns;
     return this;
@@ -266,6 +269,9 @@ class InsertBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   values(data) {
     const rows = Array.isArray(data) ? data : [data];
     this._values.push(...rows);
@@ -332,6 +338,9 @@ class UpdateBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   set(data) {
     this._set = { ...this._set, ...data };
     return this;
@@ -386,6 +395,9 @@ class DeleteBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   where(condition) {
     this._where.push(condition);
     return this;
@@ -412,7 +424,7 @@ class DeleteBuilder {
     return { sql: query, params };
   }
 }
-// ../bungres-orm/src/relational.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/relational.ts
 var _relationsCache = new WeakMap;
 
 class RelationalQueryBuilder {
@@ -639,7 +651,7 @@ class RelationalQueryBuilder {
   }
 }
 
-// ../bungres-orm/src/db.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/db.ts
 function parseDBName(url) {
   try {
     return new URL(url).pathname.slice(1);
@@ -805,7 +817,7 @@ function createDB(config2) {
   }
   return db2;
 }
-// ../bungres-orm/src/ddl.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/ddl.ts
 function generateCreateTable(config2, ifNotExists = true) {
   const tableName = config2.schema ? `"${config2.schema}"."${config2.name}"` : `"${config2.name}"`;
   const exists = ifNotExists ? " IF NOT EXISTS" : "";
@@ -1455,21 +1467,22 @@ function generateSchemaTS(tableMap, dbSchema) {
     `// Generated at: ${new Date().toISOString()}`,
     ``,
     `import {`,
-    `  table,`,
+    `  snakeCase,`,
     `  text, varchar, char, integer, bigint, smallint,`,
     `  serial, bigserial, boolean, real, doublePrecision,`,
     `  numeric, decimal, json, jsonb,`,
     `  timestamp, timestamptz, date, time, uuid,`,
     `  bytea, inet,`,
+    `  textArray, integerArray, varcharArray, uuidArray,`,
     `} from "@bungres/orm";`,
     ``
   ];
   for (const [, table2] of tableMap) {
     const varName = toCamelCase(table2.tableName);
-    lines.push(`export const ${varName} = table("${table2.tableName}", {`);
+    lines.push(`export const ${varName} = snakeCase.table("${table2.tableName}", {`);
     for (const col2 of table2.columns) {
       const colExpr = buildColumnExpression(col2);
-      lines.push(`  ${col2.name}: ${colExpr},`);
+      lines.push(`  ${toCamelCase(col2.name)}: ${colExpr},`);
     }
     const options = [];
     if (dbSchema !== "public") {
@@ -1516,84 +1529,97 @@ function generateSchemaTS(tableMap, dbSchema) {
 `);
 }
 function buildColumnExpression(col2) {
-  let expr = pgTypeToBungresBuilder(col2);
+  const opts = [];
+  if (col2.dataType === "character varying" || col2.dataType === "character") {
+    if (col2.maxLength)
+      opts.push(`length: ${col2.maxLength}`);
+  }
   if (col2.isPrimary)
-    expr += `.primaryKey()`;
+    opts.push(`primaryKey: true`);
   else if (!col2.isNullable)
-    expr += `.notNull()`;
+    opts.push(`notNull: true`);
   if (col2.isUnique && !col2.isPrimary)
-    expr += `.unique()`;
+    opts.push(`unique: true`);
   if (col2.columnDefault !== null && !col2.isPrimary) {
     if (col2.columnDefault.includes("(")) {
-      expr += `.defaultRaw("${col2.columnDefault}")`;
-    } else if (col2.dataType === "boolean") {
-      expr += `.default(${col2.columnDefault})`;
-    } else if (col2.dataType.includes("int") || col2.dataType.includes("numeric") || col2.dataType.includes("real") || col2.dataType.includes("double")) {
-      expr += `.default(${col2.columnDefault})`;
+      opts.push(`defaultRaw: "${col2.columnDefault}"`);
+    } else if (col2.dataType === "boolean" || col2.dataType.includes("int") || col2.dataType.includes("numeric") || col2.dataType.includes("real") || col2.dataType.includes("double")) {
+      opts.push(`default: ${col2.columnDefault}`);
     } else {
       const cleaned = col2.columnDefault.replace(/^'(.*)'::.*$/, "$1");
-      expr += `.default("${cleaned}")`;
+      opts.push(`default: "${cleaned}"`);
     }
   }
   if (col2.foreignTable && col2.foreignColumn) {
     const deleteRule = col2.deleteRule?.toLowerCase().replace(" ", " ");
     const updateRule = col2.updateRule?.toLowerCase().replace(" ", " ");
-    let refOpts = "";
-    if (deleteRule && deleteRule !== "no action") {
-      refOpts += `onDelete: "${deleteRule}", `;
-    }
-    if (updateRule && updateRule !== "no action") {
-      refOpts += `onUpdate: "${updateRule}"`;
-    }
-    const opts = refOpts ? `, { ${refOpts.trim().replace(/,$/, "")} }` : "";
-    expr += `.references("${col2.foreignTable}", "${col2.foreignColumn}"${opts})`;
-  }
-  return expr;
+    let refOpts = `table: "${col2.foreignTable}", column: "${col2.foreignColumn}"`;
+    if (deleteRule && deleteRule !== "no action")
+      refOpts += `, onDelete: "${deleteRule}"`;
+    if (updateRule && updateRule !== "no action")
+      refOpts += `, onUpdate: "${updateRule}"`;
+    opts.push(`references: { ${refOpts} }`);
+  }
+  let builderName = pgTypeToBungresBuilderName(col2);
+  if (opts.length > 0) {
+    return `${builderName}({ ${opts.join(", ")} })`;
+  }
+  return `${builderName}()`;
 }
-function pgTypeToBungresBuilder(col2) {
+function pgTypeToBungresBuilderName(col2) {
   const dt = col2.dataType;
-  const name = col2.name;
   if (dt === "uuid")
-    return `uuid("${name}")`;
+    return "uuid";
   if (dt === "text")
-    return `text("${name}")`;
+    return "text";
   if (dt === "character varying")
-    return col2.maxLength ? `varchar("${name}", ${col2.maxLength})` : `varchar("${name}")`;
+    return "varchar";
   if (dt === "character")
-    return col2.maxLength ? `char("${name}", ${col2.maxLength})` : `char("${name}")`;
+    return "char";
   if (dt === "integer")
-    return `integer("${name}")`;
+    return "integer";
   if (dt === "bigint")
-    return `bigint("${name}")`;
+    return "bigint";
   if (dt === "smallint")
-    return `smallint("${name}")`;
+    return "smallint";
   if (dt === "boolean")
-    return `boolean("${name}")`;
+    return "boolean";
   if (dt === "real")
-    return `real("${name}")`;
+    return "real";
   if (dt === "double precision")
-    return `doublePrecision("${name}")`;
+    return "doublePrecision";
   if (dt === "numeric" || dt === "decimal")
-    return `numeric("${name}")`;
+    return "numeric";
   if (dt === "json")
-    return `json("${name}")`;
+    return "json";
   if (dt === "jsonb")
-    return `jsonb("${name}")`;
+    return "jsonb";
   if (dt === "timestamp without time zone")
-    return `timestamp("${name}")`;
+    return "timestamp";
   if (dt === "timestamp with time zone")
-    return `timestamptz("${name}")`;
+    return "timestamptz";
   if (dt === "date")
-    return `date("${name}")`;
+    return "date";
   if (dt === "time without time zone")
-    return `time("${name}")`;
+    return "time";
   if (dt === "bytea")
-    return `bytea("${name}")`;
+    return "bytea";
   if (dt === "inet")
-    return `inet("${name}")`;
+    return "inet";
   if (dt === "USER-DEFINED" && col2.udtName === "citext")
-    return `text("${name}")`;
-  return `text("${name}") /* original type: ${dt} */`;
+    return "text";
+  if (dt === "ARRAY") {
+    if (col2.udtName === "_text")
+      return "textArray";
+    if (col2.udtName === "_int4" || col2.udtName === "_int8")
+      return "integerArray";
+    if (col2.udtName === "_varchar")
+      return "varcharArray";
+    if (col2.udtName === "_uuid")
+      return "uuidArray";
+    return "textArray";
+  }
+  return "text";
 }
 function toCamelCase(str) {
   return str.replace(/_([a-z])/g, (_, c) => c.toUpperCase());

package/dist/index.js

@@ -38,7 +38,7 @@ async function loadConfig(cwd = process.cwd()) {
 // src/schema-loader.ts
 import { resolve as resolve2, join as join2 } from "path";
 
-// ../bungres-orm/src/table.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/table.ts
 var TableConfigSymbol = Symbol.for("BungresTableConfig");
 function getTableConfig(table) {
   return table[TableConfigSymbol];
@@ -78,7 +78,7 @@ function createTableFactory(casing) {
 var table = createTableFactory("none");
 var snakeCase = { table: createTableFactory("snake") };
 var camelCase = { table: createTableFactory("camel") };
-// ../bungres-orm/src/column.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/column.ts
 function buildColumn(dataType, nameOrOpts, opts) {
   let name = "";
   let options = opts;
@@ -132,7 +132,7 @@ var interval = col("interval");
 var inet = col("inet");
 var cidr = col("cidr");
 var macaddr = col("macaddr");
-// ../bungres-orm/src/sql.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/sql.ts
 function sqlJoin(chunks, separator = ", ") {
   const params = [];
   const parts = [];
@@ -143,7 +143,7 @@ function sqlJoin(chunks, separator = ", ") {
   }
   return { sql: parts.join(separator), params };
 }
-// ../bungres-orm/src/query.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/query.ts
 class SelectBuilder {
   _table;
   _executor;
@@ -163,6 +163,9 @@ class SelectBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   select(...columns) {
     this._select = columns;
     return this;
@@ -263,6 +266,9 @@ class InsertBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   values(data) {
     const rows = Array.isArray(data) ? data : [data];
     this._values.push(...rows);
@@ -329,6 +335,9 @@ class UpdateBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   set(data) {
     this._set = { ...this._set, ...data };
     return this;
@@ -383,6 +392,9 @@ class DeleteBuilder {
   then(onfulfilled, onrejected) {
     return this._executor.execute(this).then(onfulfilled, onrejected);
   }
+  async single() {
+    return this._executor.executeSingle(this);
+  }
   where(condition) {
     this._where.push(condition);
     return this;
@@ -409,7 +421,7 @@ class DeleteBuilder {
     return { sql: query, params };
   }
 }
-// ../bungres-orm/src/relational.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/relational.ts
 var _relationsCache = new WeakMap;
 
 class RelationalQueryBuilder {
@@ -636,7 +648,7 @@ class RelationalQueryBuilder {
   }
 }
 
-// ../bungres-orm/src/db.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/db.ts
 function parseDBName(url) {
   try {
     return new URL(url).pathname.slice(1);
@@ -802,7 +814,7 @@ function createDB(config) {
   }
   return db;
 }
-// ../bungres-orm/src/ddl.ts
+// ../../node_modules/.bun/@bungres+orm@0.2.0/node_modules/@bungres/orm/src/ddl.ts
 function generateCreateTable(config, ifNotExists = true) {
   const tableName = config.schema ? `"${config.schema}"."${config.name}"` : `"${config.name}"`;
   const exists = ifNotExists ? " IF NOT EXISTS" : "";
@@ -1450,21 +1462,22 @@ function generateSchemaTS(tableMap, dbSchema) {
     `// Generated at: ${new Date().toISOString()}`,
     ``,
     `import {`,
-    `  table,`,
+    `  snakeCase,`,
     `  text, varchar, char, integer, bigint, smallint,`,
     `  serial, bigserial, boolean, real, doublePrecision,`,
     `  numeric, decimal, json, jsonb,`,
     `  timestamp, timestamptz, date, time, uuid,`,
     `  bytea, inet,`,
+    `  textArray, integerArray, varcharArray, uuidArray,`,
     `} from "@bungres/orm";`,
     ``
   ];
   for (const [, table2] of tableMap) {
     const varName = toCamelCase(table2.tableName);
-    lines.push(`export const ${varName} = table("${table2.tableName}", {`);
+    lines.push(`export const ${varName} = snakeCase.table("${table2.tableName}", {`);
     for (const col2 of table2.columns) {
       const colExpr = buildColumnExpression(col2);
-      lines.push(`  ${col2.name}: ${colExpr},`);
+      lines.push(`  ${toCamelCase(col2.name)}: ${colExpr},`);
     }
     const options = [];
     if (dbSchema !== "public") {
@@ -1511,84 +1524,97 @@ function generateSchemaTS(tableMap, dbSchema) {
 `);
 }
 function buildColumnExpression(col2) {
-  let expr = pgTypeToBungresBuilder(col2);
+  const opts = [];
+  if (col2.dataType === "character varying" || col2.dataType === "character") {
+    if (col2.maxLength)
+      opts.push(`length: ${col2.maxLength}`);
+  }
   if (col2.isPrimary)
-    expr += `.primaryKey()`;
+    opts.push(`primaryKey: true`);
   else if (!col2.isNullable)
-    expr += `.notNull()`;
+    opts.push(`notNull: true`);
   if (col2.isUnique && !col2.isPrimary)
-    expr += `.unique()`;
+    opts.push(`unique: true`);
   if (col2.columnDefault !== null && !col2.isPrimary) {
     if (col2.columnDefault.includes("(")) {
-      expr += `.defaultRaw("${col2.columnDefault}")`;
-    } else if (col2.dataType === "boolean") {
-      expr += `.default(${col2.columnDefault})`;
-    } else if (col2.dataType.includes("int") || col2.dataType.includes("numeric") || col2.dataType.includes("real") || col2.dataType.includes("double")) {
-      expr += `.default(${col2.columnDefault})`;
+      opts.push(`defaultRaw: "${col2.columnDefault}"`);
+    } else if (col2.dataType === "boolean" || col2.dataType.includes("int") || col2.dataType.includes("numeric") || col2.dataType.includes("real") || col2.dataType.includes("double")) {
+      opts.push(`default: ${col2.columnDefault}`);
     } else {
       const cleaned = col2.columnDefault.replace(/^'(.*)'::.*$/, "$1");
-      expr += `.default("${cleaned}")`;
+      opts.push(`default: "${cleaned}"`);
     }
   }
   if (col2.foreignTable && col2.foreignColumn) {
     const deleteRule = col2.deleteRule?.toLowerCase().replace(" ", " ");
     const updateRule = col2.updateRule?.toLowerCase().replace(" ", " ");
-    let refOpts = "";
-    if (deleteRule && deleteRule !== "no action") {
-      refOpts += `onDelete: "${deleteRule}", `;
-    }
-    if (updateRule && updateRule !== "no action") {
-      refOpts += `onUpdate: "${updateRule}"`;
-    }
-    const opts = refOpts ? `, { ${refOpts.trim().replace(/,$/, "")} }` : "";
-    expr += `.references("${col2.foreignTable}", "${col2.foreignColumn}"${opts})`;
-  }
-  return expr;
+    let refOpts = `table: "${col2.foreignTable}", column: "${col2.foreignColumn}"`;
+    if (deleteRule && deleteRule !== "no action")
+      refOpts += `, onDelete: "${deleteRule}"`;
+    if (updateRule && updateRule !== "no action")
+      refOpts += `, onUpdate: "${updateRule}"`;
+    opts.push(`references: { ${refOpts} }`);
+  }
+  let builderName = pgTypeToBungresBuilderName(col2);
+  if (opts.length > 0) {
+    return `${builderName}({ ${opts.join(", ")} })`;
+  }
+  return `${builderName}()`;
 }
-function pgTypeToBungresBuilder(col2) {
+function pgTypeToBungresBuilderName(col2) {
   const dt = col2.dataType;
-  const name = col2.name;
   if (dt === "uuid")
-    return `uuid("${name}")`;
+    return "uuid";
   if (dt === "text")
-    return `text("${name}")`;
+    return "text";
   if (dt === "character varying")
-    return col2.maxLength ? `varchar("${name}", ${col2.maxLength})` : `varchar("${name}")`;
+    return "varchar";
   if (dt === "character")
-    return col2.maxLength ? `char("${name}", ${col2.maxLength})` : `char("${name}")`;
+    return "char";
   if (dt === "integer")
-    return `integer("${name}")`;
+    return "integer";
   if (dt === "bigint")
-    return `bigint("${name}")`;
+    return "bigint";
   if (dt === "smallint")
-    return `smallint("${name}")`;
+    return "smallint";
   if (dt === "boolean")
-    return `boolean("${name}")`;
+    return "boolean";
   if (dt === "real")
-    return `real("${name}")`;
+    return "real";
   if (dt === "double precision")
-    return `doublePrecision("${name}")`;
+    return "doublePrecision";
   if (dt === "numeric" || dt === "decimal")
-    return `numeric("${name}")`;
+    return "numeric";
   if (dt === "json")
-    return `json("${name}")`;
+    return "json";
   if (dt === "jsonb")
-    return `jsonb("${name}")`;
+    return "jsonb";
   if (dt === "timestamp without time zone")
-    return `timestamp("${name}")`;
+    return "timestamp";
   if (dt === "timestamp with time zone")
-    return `timestamptz("${name}")`;
+    return "timestamptz";
   if (dt === "date")
-    return `date("${name}")`;
+    return "date";
   if (dt === "time without time zone")
-    return `time("${name}")`;
+    return "time";
   if (dt === "bytea")
-    return `bytea("${name}")`;
+    return "bytea";
   if (dt === "inet")
-    return `inet("${name}")`;
+    return "inet";
   if (dt === "USER-DEFINED" && col2.udtName === "citext")
-    return `text("${name}")`;
-  return `text("${name}") /* original type: ${dt} */`;
+    return "text";
+  if (dt === "ARRAY") {
+    if (col2.udtName === "_text")
+      return "textArray";
+    if (col2.udtName === "_int4" || col2.udtName === "_int8")
+      return "integerArray";
+    if (col2.udtName === "_varchar")
+      return "varcharArray";
+    if (col2.udtName === "_uuid")
+      return "uuidArray";
+    return "textArray";
+  }
+  return "text";
 }
 function toCamelCase(str) {
   return str.replace(/_([a-z])/g, (_, c) => c.toUpperCase());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bungres/kit",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "CLI toolkit for @bungres/orm — migrate, push, generate, pull",
   "type": "module",
   "bin": {
@@ -34,7 +34,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@bungres/orm": "0.1.0"
+    "@bungres/orm": "0.2.0"
   },
   "devDependencies": {
     "bun-types": "latest",

package/src/commands/pull.ts

@@ -194,23 +194,24 @@ function generateSchemaTS(
     `// Generated at: ${new Date().toISOString()}`,
     ``,
     `import {`,
-    `  table,`,
+    `  snakeCase,`,
     `  text, varchar, char, integer, bigint, smallint,`,
     `  serial, bigserial, boolean, real, doublePrecision,`,
     `  numeric, decimal, json, jsonb,`,
     `  timestamp, timestamptz, date, time, uuid,`,
     `  bytea, inet,`,
+    `  textArray, integerArray, varcharArray, uuidArray,`,
     `} from "@bungres/orm";`,
     ``,
   ];
 
   for (const [, table] of tableMap) {
     const varName = toCamelCase(table.tableName);
-    lines.push(`export const ${varName} = table("${table.tableName}", {`);
+    lines.push(`export const ${varName} = snakeCase.table("${table.tableName}", {`);
 
     for (const col of table.columns) {
       const colExpr = buildColumnExpression(col);
-      lines.push(`  ${col.name}: ${colExpr},`);
+      lines.push(`  ${toCamelCase(col.name)}: ${colExpr},`);
     }
 
     // Third argument: Table options (schema, indexes)
@@ -260,78 +261,77 @@ function generateSchemaTS(
 }
 
 function buildColumnExpression(col: TableInfo["columns"][number]): string {
-  let expr = pgTypeToBungresBuilder(col);
+  const opts: string[] = [];
 
-  if (col.isPrimary) expr += `.primaryKey()`;
-  else if (!col.isNullable) expr += `.notNull()`;
+  if (col.dataType === "character varying" || col.dataType === "character") {
+    if (col.maxLength) opts.push(`length: ${col.maxLength}`);
+  }
+
+  if (col.isPrimary) opts.push(`primaryKey: true`);
+  else if (!col.isNullable) opts.push(`notNull: true`);
 
-  if (col.isUnique && !col.isPrimary) expr += `.unique()`;
+  if (col.isUnique && !col.isPrimary) opts.push(`unique: true`);
 
   if (col.columnDefault !== null && !col.isPrimary) {
     if (col.columnDefault.includes("(")) {
-      // Function call — raw
-      expr += `.defaultRaw("${col.columnDefault}")`;
-    } else if (col.dataType === "boolean") {
-      expr += `.default(${col.columnDefault})`;
-    } else if (
-      col.dataType.includes("int") ||
-      col.dataType.includes("numeric") ||
-      col.dataType.includes("real") ||
-      col.dataType.includes("double")
-    ) {
-      expr += `.default(${col.columnDefault})`;
+      opts.push(`defaultRaw: "${col.columnDefault}"`);
+    } else if (col.dataType === "boolean" || col.dataType.includes("int") || col.dataType.includes("numeric") || col.dataType.includes("real") || col.dataType.includes("double")) {
+      opts.push(`default: ${col.columnDefault}`);
     } else {
-      // Strip surrounding quotes for string defaults
       const cleaned = col.columnDefault.replace(/^'(.*)'::.*$/, "$1");
-      expr += `.default("${cleaned}")`;
+      opts.push(`default: "${cleaned}"`);
     }
   }
 
   if (col.foreignTable && col.foreignColumn) {
     const deleteRule = col.deleteRule?.toLowerCase().replace(" ", " ");
     const updateRule = col.updateRule?.toLowerCase().replace(" ", " ");
-    let refOpts = "";
-    if (deleteRule && deleteRule !== "no action") {
-      refOpts += `onDelete: "${deleteRule}", `;
-    }
-    if (updateRule && updateRule !== "no action") {
-      refOpts += `onUpdate: "${updateRule}"`;
-    }
-    const opts = refOpts ? `, { ${refOpts.trim().replace(/,$/, "")} }` : "";
-    expr += `.references("${col.foreignTable}", "${col.foreignColumn}"${opts})`;
+    let refOpts = `table: "${col.foreignTable}", column: "${col.foreignColumn}"`;
+    if (deleteRule && deleteRule !== "no action") refOpts += `, onDelete: "${deleteRule}"`;
+    if (updateRule && updateRule !== "no action") refOpts += `, onUpdate: "${updateRule}"`;
+    opts.push(`references: { ${refOpts} }`);
   }
 
-  return expr;
+  let builderName = pgTypeToBungresBuilderName(col);
+  
+  if (opts.length > 0) {
+    return `${builderName}({ ${opts.join(", ")} })`;
+  }
+  return `${builderName}()`;
 }
 
-function pgTypeToBungresBuilder(col: TableInfo["columns"][number]): string {
+function pgTypeToBungresBuilderName(col: TableInfo["columns"][number]): string {
   const dt = col.dataType;
-  const name = col.name;
-
-  if (dt === "uuid") return `uuid("${name}")`;
-  if (dt === "text") return `text("${name}")`;
-  if (dt === "character varying")
-    return col.maxLength ? `varchar("${name}", ${col.maxLength})` : `varchar("${name}")`;
-  if (dt === "character")
-    return col.maxLength ? `char("${name}", ${col.maxLength})` : `char("${name}")`;
-  if (dt === "integer") return `integer("${name}")`;
-  if (dt === "bigint") return `bigint("${name}")`;
-  if (dt === "smallint") return `smallint("${name}")`;
-  if (dt === "boolean") return `boolean("${name}")`;
-  if (dt === "real") return `real("${name}")`;
-  if (dt === "double precision") return `doublePrecision("${name}")`;
-  if (dt === "numeric" || dt === "decimal") return `numeric("${name}")`;
-  if (dt === "json") return `json("${name}")`;
-  if (dt === "jsonb") return `jsonb("${name}")`;
-  if (dt === "timestamp without time zone") return `timestamp("${name}")`;
-  if (dt === "timestamp with time zone") return `timestamptz("${name}")`;
-  if (dt === "date") return `date("${name}")`;
-  if (dt === "time without time zone") return `time("${name}")`;
-  if (dt === "bytea") return `bytea("${name}")`;
-  if (dt === "inet") return `inet("${name}")`;
-  if (dt === "USER-DEFINED" && col.udtName === "citext") return `text("${name}")`;
+
+  if (dt === "uuid") return "uuid";
+  if (dt === "text") return "text";
+  if (dt === "character varying") return "varchar";
+  if (dt === "character") return "char";
+  if (dt === "integer") return "integer";
+  if (dt === "bigint") return "bigint";
+  if (dt === "smallint") return "smallint";
+  if (dt === "boolean") return "boolean";
+  if (dt === "real") return "real";
+  if (dt === "double precision") return "doublePrecision";
+  if (dt === "numeric" || dt === "decimal") return "numeric";
+  if (dt === "json") return "json";
+  if (dt === "jsonb") return "jsonb";
+  if (dt === "timestamp without time zone") return "timestamp";
+  if (dt === "timestamp with time zone") return "timestamptz";
+  if (dt === "date") return "date";
+  if (dt === "time without time zone") return "time";
+  if (dt === "bytea") return "bytea";
+  if (dt === "inet") return "inet";
+  if (dt === "USER-DEFINED" && col.udtName === "citext") return "text";
+  if (dt === "ARRAY") {
+    if (col.udtName === "_text") return "textArray";
+    if (col.udtName === "_int4" || col.udtName === "_int8") return "integerArray";
+    if (col.udtName === "_varchar") return "varcharArray";
+    if (col.udtName === "_uuid") return "uuidArray";
+    return "textArray";
+  }
   // Fallback
-  return `text("${name}") /* original type: ${dt} */`;
+  return "text";
 }
 
 function toCamelCase(str: string): string {