postgresdk 0.6.6 → 0.6.8

package/dist/cli.js

@@ -1005,7 +1005,7 @@ function emitZod(table, opts) {
   const Type = pascal(table.name);
   const zFor = (pg) => {
     if (pg === "uuid")
-      return `z.string().uuid()`;
+      return `z.string()`;
     if (pg === "bool" || pg === "boolean")
       return `z.boolean()`;
     if (pg === "int2" || pg === "int4" || pg === "int8")
@@ -2370,8 +2370,8 @@ function emitTableTest(table, clientPath, framework = "vitest") {
   const imports = getFrameworkImports(framework);
   const hasForeignKeys = table.fks.length > 0;
   const foreignKeySetup = hasForeignKeys ? generateForeignKeySetup(table, clientPath) : null;
-  const sampleData = generateSampleData(table, hasForeignKeys);
-  const updateData = generateUpdateData(table);
+  const sampleData = generateSampleDataFromSchema(table, hasForeignKeys);
+  const updateData = generateUpdateDataFromSchema(table);
   return `${imports}
 import { SDK } from '${clientPath}';
 import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
@@ -2381,12 +2381,12 @@ ${foreignKeySetup?.imports || ""}
  * Basic tests for ${tableName} table operations
  * 
  * These tests demonstrate basic CRUD operations.
- * The test data is auto-generated and may need adjustment for your specific schema.
+ * The test data is auto-generated based on your schema.
  * 
- * If tests fail due to validation errors:
- * 1. Check which fields are required by your API
- * 2. Update the test data below to match your schema requirements
- * 3. Consider adding your own business logic tests in separate files
+ * If tests fail:
+ * 1. Check the error messages for missing required fields
+ * 2. Update the test data below to match your business requirements
+ * 3. Consider adding custom tests for business logic in separate files
  */
 describe('${Type} SDK Operations', () => {
   let sdk: SDK;
@@ -2465,13 +2465,6 @@ export default defineConfig({
     testTimeout: 30000,
     hookTimeout: 30000,
     // The reporters are configured via CLI in the test script
-    // Force color output in terminal
-    pool: 'forks',
-    poolOptions: {
-      forks: {
-        singleFork: true,
-      }
-    }
   },
 });
 `;
@@ -2506,6 +2499,7 @@ version: '3.8'
 services:
   postgres:
     image: postgres:17-alpine
+    container_name: postgresdk-test-database
     environment:
       POSTGRES_USER: testuser
       POSTGRES_PASSWORD: testpass
@@ -2544,7 +2538,39 @@ set -e
 
 SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 
-echo "\uD83D\uDC33 Starting test database..."
+# Cleanup function to ensure database is stopped
+cleanup() {
+  echo ""
+  echo "\uD83E\uDDF9 Cleaning up..."
+  if [ ! -z "\${SERVER_PID}" ]; then
+    echo "   Stopping API server..."
+    kill $SERVER_PID 2>/dev/null || true
+  fi
+  echo "   Stopping test database..."
+  docker-compose -f "$SCRIPT_DIR/docker-compose.yml" stop 2>/dev/null || true
+  echo "   Done!"
+}
+
+# Set up cleanup trap
+trap cleanup EXIT INT TERM
+
+# Check for existing PostgreSQL container or connection
+echo "\uD83D\uDD0D Checking for existing database connections..."
+if docker ps | grep -q "5432->5432"; then
+  echo "⚠️  Found existing PostgreSQL container on port 5432"
+  echo "   Stopping existing container..."
+  docker ps --filter "publish=5432" --format "{{.ID}}" | xargs -r docker stop
+  sleep 2
+fi
+
+# Clean up any existing test database container
+if docker ps -a | grep -q "postgresdk-test-database"; then
+  echo "\uD83E\uDDF9 Cleaning up existing test database container..."
+  docker-compose -f "$SCRIPT_DIR/docker-compose.yml" down -v
+  sleep 2
+fi
+
+echo "\uD83D\uDC33 Starting fresh test database..."
 cd "$SCRIPT_DIR"
 docker-compose up -d --wait
 
@@ -2552,10 +2578,6 @@ docker-compose up -d --wait
 export TEST_DATABASE_URL="postgres://testuser:testpass@localhost:5432/testdb"
 export TEST_API_URL="http://localhost:3000"
 
-# Force color output for better terminal experience
-export FORCE_COLOR=1
-export CI=""
-
 # Wait for database to be ready
 echo "⏳ Waiting for database..."
 sleep 3
@@ -2570,11 +2592,11 @@ echo "⚠️  TODO: Uncomment and customize the API server startup command below
 echo ""
 echo "  # Example for Node.js/Bun:"
 echo "  # cd ../.. && npm run dev &"
-echo "  # SERVER_PID=$!"
+echo "  # SERVER_PID=\\$!"
 echo ""
 echo "  # Example for custom server file:"
 echo "  # cd ../.. && node server.js &"
-echo "  # SERVER_PID=$!"
+echo "  # SERVER_PID=\\$!"
 echo ""
 echo "  Please edit this script to start your API server."
 echo ""
@@ -2592,12 +2614,6 @@ ${getTestCommand(framework, runCommand)}
 
 TEST_EXIT_CODE=$?
 
-# Cleanup
-# if [ ! -z "\${SERVER_PID}" ]; then
-#   echo "\uD83D\uDED1 Stopping API server..."
-#   kill $SERVER_PID 2>/dev/null || true
-# fi
-
 if [ $TEST_EXIT_CODE -eq 0 ]; then
   echo "✅ Tests completed successfully!"
 else
@@ -2608,8 +2624,10 @@ echo ""
 echo "\uD83D\uDCCA Test results saved to:"
 echo "  $TEST_RESULTS_DIR/"
 echo ""
-echo "To stop the test database, run:"
-echo "  cd $SCRIPT_DIR && docker-compose down"
+echo "\uD83D\uDCA1 Tips:"
+echo "  - Database will be stopped automatically on script exit"
+echo "  - To manually stop the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down"
+echo "  - To reset the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down -v"
 
 exit $TEST_EXIT_CODE
 `;
@@ -2629,7 +2647,7 @@ function generateForeignKeySetup(table, clientPath) {
       variables.push(`let ${foreignTable}Id: string;`);
       setupStatements.push(`
     // Create parent ${foreignTable} record for foreign key reference
-    const ${foreignTable}Data = ${generateMinimalSampleData(foreignTable)};
+    const ${foreignTable}Data: Insert${ForeignType} = ${generateMinimalDataForTable(foreignTable)};
     const created${ForeignType} = await sdk.${foreignTable}.create(${foreignTable}Data);
     ${foreignTable}Id = created${ForeignType}.id;`);
       cleanupStatements.push(`
@@ -2652,29 +2670,40 @@ function generateForeignKeySetup(table, clientPath) {
     cleanup: cleanupStatements.join("")
   };
 }
-function generateMinimalSampleData(tableName) {
-  const commonPatterns = {
-    contacts: `{ name: 'Test Contact', email: 'test@example.com', gender: 'M', date_of_birth: new Date('1990-01-01'), emergency_contact: 'Emergency Contact', clinic_location: 'Main Clinic', specialty: 'General', fmv_tiering: 'Standard', flight_preferences: 'Economy', dietary_restrictions: [], special_accommodations: 'None' }`,
-    tags: `{ name: 'Test Tag' }`,
-    authors: `{ name: 'Test Author' }`,
-    books: `{ title: 'Test Book' }`,
-    users: `{ name: 'Test User', email: 'test@example.com' }`,
-    categories: `{ name: 'Test Category' }`,
-    products: `{ name: 'Test Product', price: 10.99 }`,
-    orders: `{ total: 100.00 }`
-  };
-  return commonPatterns[tableName] || `{ name: 'Test ${pascal(tableName)}' }`;
+function generateMinimalDataForTable(tableName) {
+  if (tableName.includes("author")) {
+    return `{ name: 'Test Author' }`;
+  }
+  if (tableName.includes("book")) {
+    return `{ title: 'Test Book' }`;
+  }
+  if (tableName.includes("tag")) {
+    return `{ name: 'Test Tag' }`;
+  }
+  if (tableName.includes("user")) {
+    return `{ name: 'Test User', email: 'test@example.com' }`;
+  }
+  if (tableName.includes("category") || tableName.includes("categories")) {
+    return `{ name: 'Test Category' }`;
+  }
+  if (tableName.includes("product")) {
+    return `{ name: 'Test Product', price: 10.99 }`;
+  }
+  if (tableName.includes("order")) {
+    return `{ total: 100.00, status: 'pending' }`;
+  }
+  return `{ name: 'Test ${pascal(tableName)}' }`;
 }
 function getTestCommand(framework, baseCommand) {
   switch (framework) {
     case "vitest":
-      return `FORCE_COLOR=1 ${baseCommand} --reporter=default --reporter=json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+      return `${baseCommand} --reporter=default --reporter=json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
     case "jest":
-      return `FORCE_COLOR=1 ${baseCommand} --colors --json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+      return `${baseCommand} --json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
     case "bun":
-      return `FORCE_COLOR=1 ${baseCommand} "$@" 2>&1 | tee "$TEST_RESULTS_DIR/results-\${TIMESTAMP}.txt"`;
+      return `NO_COLOR=1 ${baseCommand} "$@" 2>&1 | tee "$TEST_RESULTS_DIR/results-\${TIMESTAMP}.txt"`;
     default:
-      return `FORCE_COLOR=1 ${baseCommand} "$@"`;
+      return `${baseCommand} "$@"`;
   }
 }
 function getFrameworkImports(framework) {
@@ -2689,35 +2718,39 @@ function getFrameworkImports(framework) {
       return "import { describe, it, expect, beforeAll, afterAll } from 'vitest';";
   }
 }
-function generateSampleData(table, hasForeignKeys = false) {
+function generateSampleDataFromSchema(table, hasForeignKeys = false) {
   const fields = [];
   const foreignKeyColumns = new Map;
   if (hasForeignKeys) {
     for (const fk of table.fks) {
-      if (fk.from.length === 1 && fk.from[0]) {
-        foreignKeyColumns.set(fk.from[0], fk.toTable);
+      for (let i = 0;i < fk.from.length; i++) {
+        const fromCol = fk.from[i];
+        if (fromCol) {
+          foreignKeyColumns.set(fromCol, fk.toTable);
+        }
       }
     }
   }
   for (const col of table.columns) {
-    if (col.name === "id" && col.hasDefault) {
-      continue;
-    }
-    if ((col.name === "created_at" || col.name === "updated_at") && col.hasDefault) {
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    if (isAutoGenerated) {
       continue;
     }
-    if (col.name === "deleted_at") {
+    if (col.name === "deleted_at" || col.name === "deleted") {
+      if (col.nullable) {
+        fields.push(`    ${col.name}: null`);
+      } else {
+        const value = generateValueForColumn(col);
+        fields.push(`    ${col.name}: ${value}`);
+      }
       continue;
     }
-    if (!col.nullable) {
-      const foreignTable = foreignKeyColumns.get(col.name);
-      const value = foreignTable ? `${foreignTable}Id` : getSampleValue(col.pgType, col.name);
-      fields.push(`    ${col.name}: ${value}`);
-    } else {
-      const isImportant = col.name.endsWith("_id") || col.name.endsWith("_by") || col.name.includes("email") || col.name.includes("name") || col.name.includes("phone") || col.name.includes("address") || col.name.includes("description") || col.name.includes("color") || col.name.includes("type") || col.name.includes("status") || col.name.includes("subject");
-      if (isImportant) {
-        const foreignTable = foreignKeyColumns.get(col.name);
-        const value = foreignTable ? `${foreignTable}Id` : getSampleValue(col.pgType, col.name);
+    const foreignTable = foreignKeyColumns.get(col.name);
+    if (!col.nullable || foreignTable || col.hasDefault && !isAutoGenerated || shouldIncludeNullableColumn(col)) {
+      if (foreignTable) {
+        fields.push(`    ${col.name}: ${foreignTable}Id`);
+      } else {
+        const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
     }
@@ -2727,14 +2760,23 @@ ${fields.join(`,
 `)}
   }` : "{}";
 }
-function generateUpdateData(table) {
+function generateUpdateDataFromSchema(table) {
   const fields = [];
   for (const col of table.columns) {
-    if (col.hasDefault || col.name === "id" || col.name === "created_at" || col.name === "updated_at") {
+    if (table.pk.includes(col.name) || col.hasDefault) {
+      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
+      if (autoGenerated.includes(col.name.toLowerCase())) {
+        continue;
+      }
+    }
+    if (col.name.endsWith("_id")) {
       continue;
     }
-    if (!col.nullable && fields.length === 0) {
-      const value = getSampleValue(col.pgType, col.name, true);
+    if (col.name === "deleted_at" || col.name === "deleted") {
+      continue;
+    }
+    if (!col.nullable || shouldIncludeNullableColumn(col)) {
+      const value = generateValueForColumn(col, true);
       fields.push(`    ${col.name}: ${value}`);
       break;
     }
@@ -2744,104 +2786,150 @@ ${fields.join(`,
 `)}
   }` : "{}";
 }
-function getSampleValue(type, name, isUpdate = false) {
-  const suffix = isUpdate ? ' + " (updated)"' : "";
-  if (name.endsWith("_id") || name.endsWith("_by")) {
-    return `'550e8400-e29b-41d4-a716-446655440000'`;
-  }
-  if (name.includes("email")) {
-    return `'test${isUpdate ? ".updated" : ""}@example.com'`;
-  }
-  if (name === "color") {
-    return `'#${isUpdate ? "FF0000" : "0000FF"}'`;
-  }
-  if (name === "gender") {
-    return `'${isUpdate ? "F" : "M"}'`;
-  }
-  if (name.includes("phone")) {
-    return `'${isUpdate ? "555-0200" : "555-0100"}'`;
-  }
-  if (name.includes("address")) {
-    return `'123 ${isUpdate ? "Updated" : "Test"} Street'`;
-  }
-  if (name === "type" || name === "status") {
-    return `'${isUpdate ? "updated" : "active"}'`;
-  }
-  if (name === "subject") {
-    return `'Test Subject${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name.includes("name") || name.includes("title")) {
-    return `'Test ${pascal(name)}'${suffix}`;
-  }
-  if (name.includes("description") || name.includes("bio") || name.includes("content")) {
-    return `'Test description'${suffix}`;
-  }
-  if (name.includes("preferences") || name.includes("settings")) {
-    return `'Test preferences'${suffix}`;
-  }
-  if (name.includes("restrictions") || name.includes("dietary")) {
-    return `['vegetarian']`;
-  }
-  if (name.includes("location") || name.includes("clinic")) {
-    return `'Test Location'${suffix}`;
-  }
-  if (name.includes("specialty")) {
-    return `'General'`;
-  }
-  if (name.includes("tier")) {
-    return `'Standard'`;
-  }
-  if (name.includes("emergency")) {
-    return `'Emergency Contact ${isUpdate ? "Updated" : "Name"}'`;
-  }
-  if (name === "date_of_birth" || name.includes("birth")) {
-    return `new Date('1990-01-01')`;
-  }
-  if (name.includes("accommodations")) {
-    return `'No special accommodations'`;
-  }
-  if (name.includes("flight")) {
-    return `'Economy'`;
-  }
+function shouldIncludeNullableColumn(col) {
+  const importantPatterns = [
+    "_id",
+    "_by",
+    "email",
+    "name",
+    "title",
+    "description",
+    "phone",
+    "address",
+    "status",
+    "type",
+    "category",
+    "price",
+    "amount",
+    "quantity",
+    "url",
+    "slug"
+  ];
+  const name = col.name.toLowerCase();
+  return importantPatterns.some((pattern) => name.includes(pattern));
+}
+function generateValueForColumn(col, isUpdate = false) {
+  const type = col.pgType.toLowerCase();
   switch (type) {
     case "text":
     case "varchar":
     case "char":
-      return `'test_value'${suffix}`;
+    case "character varying":
+    case "bpchar":
+    case "name":
+      return `'str_${Math.random().toString(36).substring(7)}'`;
     case "int":
+    case "int2":
+    case "int4":
+    case "int8":
     case "integer":
     case "smallint":
     case "bigint":
+    case "serial":
+    case "bigserial":
       return isUpdate ? "42" : "1";
     case "decimal":
     case "numeric":
     case "real":
     case "double precision":
     case "float":
+    case "float4":
+    case "float8":
+    case "money":
       return isUpdate ? "99.99" : "10.50";
     case "boolean":
     case "bool":
       return isUpdate ? "false" : "true";
     case "date":
-      return `'2024-01-01'`;
     case "timestamp":
     case "timestamptz":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "time":
+    case "timetz":
+    case "time without time zone":
+    case "time with time zone":
       return `new Date()`;
+    case "interval":
+      return `'1 day'`;
     case "json":
     case "jsonb":
-      return `{ key: 'value' }`;
+      return `{}`;
     case "uuid":
-      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
-    case "text[]":
-    case "varchar[]":
-      return `['item1', 'item2']`;
+      return `'${generateUUID()}'`;
+    case "inet":
+      return `'192.168.1.1'`;
+    case "cidr":
+      return `'192.168.1.0/24'`;
+    case "macaddr":
+    case "macaddr8":
+      return `'08:00:2b:01:02:03'`;
+    case "point":
+      return `'(1,2)'`;
+    case "line":
+      return `'{1,2,3}'`;
+    case "lseg":
+      return `'[(0,0),(1,1)]'`;
+    case "box":
+      return `'((0,0),(1,1))'`;
+    case "path":
+      return `'[(0,0),(1,1),(2,0)]'`;
+    case "polygon":
+      return `'((0,0),(1,1),(1,0))'`;
+    case "circle":
+      return `'<(0,0),1>'`;
+    case "bit":
+    case "bit varying":
+    case "varbit":
+      return `'101'`;
+    case "bytea":
+      return `'\\\\x0102'`;
+    case "xml":
+      return `'<root/>'`;
+    case "tsvector":
+      return `'a fat cat'`;
+    case "tsquery":
+      return `'fat & cat'`;
+    case "oid":
+    case "regproc":
+    case "regprocedure":
+    case "regoper":
+    case "regoperator":
+    case "regclass":
+    case "regtype":
+    case "regconfig":
+    case "regdictionary":
+      return "1";
     default:
-      return `'test'`;
+      if (type.endsWith("[]") || type.startsWith("_")) {
+        return `[]`;
+      }
+      return `'value1'`;
   }
 }
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
 function generateTestCases(table, sampleData, updateData, hasForeignKeys = false) {
   const Type = pascal(table.name);
   const hasData = sampleData !== "{}";
+  const isJunctionTable = table.pk.length > 1 && table.columns.every((col) => table.pk.includes(col.name) || col.name.endsWith("_id"));
+  if (isJunctionTable) {
+    return `it('should create a ${table.name} relationship', async () => {
+    // This is a junction table for M:N relationships
+    // Test data depends on parent records created in other tests
+    expect(true).toBe(true);
+  });
+  
+  it('should list ${table.name} relationships', async () => {
+    const list = await sdk.${table.name}.list({ limit: 10 });
+    expect(Array.isArray(list)).toBe(true);
+  });`;
+  }
   return `it('should create a ${table.name}', async () => {
     const data: Insert${Type} = ${sampleData};
     ${hasData ? `

package/dist/index.js

@@ -735,7 +735,7 @@ function emitZod(table, opts) {
   const Type = pascal(table.name);
   const zFor = (pg) => {
     if (pg === "uuid")
-      return `z.string().uuid()`;
+      return `z.string()`;
     if (pg === "bool" || pg === "boolean")
       return `z.boolean()`;
     if (pg === "int2" || pg === "int4" || pg === "int8")
@@ -2100,8 +2100,8 @@ function emitTableTest(table, clientPath, framework = "vitest") {
   const imports = getFrameworkImports(framework);
   const hasForeignKeys = table.fks.length > 0;
   const foreignKeySetup = hasForeignKeys ? generateForeignKeySetup(table, clientPath) : null;
-  const sampleData = generateSampleData(table, hasForeignKeys);
-  const updateData = generateUpdateData(table);
+  const sampleData = generateSampleDataFromSchema(table, hasForeignKeys);
+  const updateData = generateUpdateDataFromSchema(table);
   return `${imports}
 import { SDK } from '${clientPath}';
 import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
@@ -2111,12 +2111,12 @@ ${foreignKeySetup?.imports || ""}
  * Basic tests for ${tableName} table operations
  * 
  * These tests demonstrate basic CRUD operations.
- * The test data is auto-generated and may need adjustment for your specific schema.
+ * The test data is auto-generated based on your schema.
  * 
- * If tests fail due to validation errors:
- * 1. Check which fields are required by your API
- * 2. Update the test data below to match your schema requirements
- * 3. Consider adding your own business logic tests in separate files
+ * If tests fail:
+ * 1. Check the error messages for missing required fields
+ * 2. Update the test data below to match your business requirements
+ * 3. Consider adding custom tests for business logic in separate files
  */
 describe('${Type} SDK Operations', () => {
   let sdk: SDK;
@@ -2195,13 +2195,6 @@ export default defineConfig({
     testTimeout: 30000,
     hookTimeout: 30000,
     // The reporters are configured via CLI in the test script
-    // Force color output in terminal
-    pool: 'forks',
-    poolOptions: {
-      forks: {
-        singleFork: true,
-      }
-    }
   },
 });
 `;
@@ -2236,6 +2229,7 @@ version: '3.8'
 services:
   postgres:
     image: postgres:17-alpine
+    container_name: postgresdk-test-database
     environment:
       POSTGRES_USER: testuser
       POSTGRES_PASSWORD: testpass
@@ -2274,7 +2268,39 @@ set -e
 
 SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 
-echo "\uD83D\uDC33 Starting test database..."
+# Cleanup function to ensure database is stopped
+cleanup() {
+  echo ""
+  echo "\uD83E\uDDF9 Cleaning up..."
+  if [ ! -z "\${SERVER_PID}" ]; then
+    echo "   Stopping API server..."
+    kill $SERVER_PID 2>/dev/null || true
+  fi
+  echo "   Stopping test database..."
+  docker-compose -f "$SCRIPT_DIR/docker-compose.yml" stop 2>/dev/null || true
+  echo "   Done!"
+}
+
+# Set up cleanup trap
+trap cleanup EXIT INT TERM
+
+# Check for existing PostgreSQL container or connection
+echo "\uD83D\uDD0D Checking for existing database connections..."
+if docker ps | grep -q "5432->5432"; then
+  echo "⚠️  Found existing PostgreSQL container on port 5432"
+  echo "   Stopping existing container..."
+  docker ps --filter "publish=5432" --format "{{.ID}}" | xargs -r docker stop
+  sleep 2
+fi
+
+# Clean up any existing test database container
+if docker ps -a | grep -q "postgresdk-test-database"; then
+  echo "\uD83E\uDDF9 Cleaning up existing test database container..."
+  docker-compose -f "$SCRIPT_DIR/docker-compose.yml" down -v
+  sleep 2
+fi
+
+echo "\uD83D\uDC33 Starting fresh test database..."
 cd "$SCRIPT_DIR"
 docker-compose up -d --wait
 
@@ -2282,10 +2308,6 @@ docker-compose up -d --wait
 export TEST_DATABASE_URL="postgres://testuser:testpass@localhost:5432/testdb"
 export TEST_API_URL="http://localhost:3000"
 
-# Force color output for better terminal experience
-export FORCE_COLOR=1
-export CI=""
-
 # Wait for database to be ready
 echo "⏳ Waiting for database..."
 sleep 3
@@ -2300,11 +2322,11 @@ echo "⚠️  TODO: Uncomment and customize the API server startup command below
 echo ""
 echo "  # Example for Node.js/Bun:"
 echo "  # cd ../.. && npm run dev &"
-echo "  # SERVER_PID=$!"
+echo "  # SERVER_PID=\\$!"
 echo ""
 echo "  # Example for custom server file:"
 echo "  # cd ../.. && node server.js &"
-echo "  # SERVER_PID=$!"
+echo "  # SERVER_PID=\\$!"
 echo ""
 echo "  Please edit this script to start your API server."
 echo ""
@@ -2322,12 +2344,6 @@ ${getTestCommand(framework, runCommand)}
 
 TEST_EXIT_CODE=$?
 
-# Cleanup
-# if [ ! -z "\${SERVER_PID}" ]; then
-#   echo "\uD83D\uDED1 Stopping API server..."
-#   kill $SERVER_PID 2>/dev/null || true
-# fi
-
 if [ $TEST_EXIT_CODE -eq 0 ]; then
   echo "✅ Tests completed successfully!"
 else
@@ -2338,8 +2354,10 @@ echo ""
 echo "\uD83D\uDCCA Test results saved to:"
 echo "  $TEST_RESULTS_DIR/"
 echo ""
-echo "To stop the test database, run:"
-echo "  cd $SCRIPT_DIR && docker-compose down"
+echo "\uD83D\uDCA1 Tips:"
+echo "  - Database will be stopped automatically on script exit"
+echo "  - To manually stop the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down"
+echo "  - To reset the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down -v"
 
 exit $TEST_EXIT_CODE
 `;
@@ -2359,7 +2377,7 @@ function generateForeignKeySetup(table, clientPath) {
       variables.push(`let ${foreignTable}Id: string;`);
       setupStatements.push(`
     // Create parent ${foreignTable} record for foreign key reference
-    const ${foreignTable}Data = ${generateMinimalSampleData(foreignTable)};
+    const ${foreignTable}Data: Insert${ForeignType} = ${generateMinimalDataForTable(foreignTable)};
     const created${ForeignType} = await sdk.${foreignTable}.create(${foreignTable}Data);
     ${foreignTable}Id = created${ForeignType}.id;`);
       cleanupStatements.push(`
@@ -2382,29 +2400,40 @@ function generateForeignKeySetup(table, clientPath) {
     cleanup: cleanupStatements.join("")
   };
 }
-function generateMinimalSampleData(tableName) {
-  const commonPatterns = {
-    contacts: `{ name: 'Test Contact', email: 'test@example.com', gender: 'M', date_of_birth: new Date('1990-01-01'), emergency_contact: 'Emergency Contact', clinic_location: 'Main Clinic', specialty: 'General', fmv_tiering: 'Standard', flight_preferences: 'Economy', dietary_restrictions: [], special_accommodations: 'None' }`,
-    tags: `{ name: 'Test Tag' }`,
-    authors: `{ name: 'Test Author' }`,
-    books: `{ title: 'Test Book' }`,
-    users: `{ name: 'Test User', email: 'test@example.com' }`,
-    categories: `{ name: 'Test Category' }`,
-    products: `{ name: 'Test Product', price: 10.99 }`,
-    orders: `{ total: 100.00 }`
-  };
-  return commonPatterns[tableName] || `{ name: 'Test ${pascal(tableName)}' }`;
+function generateMinimalDataForTable(tableName) {
+  if (tableName.includes("author")) {
+    return `{ name: 'Test Author' }`;
+  }
+  if (tableName.includes("book")) {
+    return `{ title: 'Test Book' }`;
+  }
+  if (tableName.includes("tag")) {
+    return `{ name: 'Test Tag' }`;
+  }
+  if (tableName.includes("user")) {
+    return `{ name: 'Test User', email: 'test@example.com' }`;
+  }
+  if (tableName.includes("category") || tableName.includes("categories")) {
+    return `{ name: 'Test Category' }`;
+  }
+  if (tableName.includes("product")) {
+    return `{ name: 'Test Product', price: 10.99 }`;
+  }
+  if (tableName.includes("order")) {
+    return `{ total: 100.00, status: 'pending' }`;
+  }
+  return `{ name: 'Test ${pascal(tableName)}' }`;
 }
 function getTestCommand(framework, baseCommand) {
   switch (framework) {
     case "vitest":
-      return `FORCE_COLOR=1 ${baseCommand} --reporter=default --reporter=json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+      return `${baseCommand} --reporter=default --reporter=json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
     case "jest":
-      return `FORCE_COLOR=1 ${baseCommand} --colors --json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+      return `${baseCommand} --json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
     case "bun":
-      return `FORCE_COLOR=1 ${baseCommand} "$@" 2>&1 | tee "$TEST_RESULTS_DIR/results-\${TIMESTAMP}.txt"`;
+      return `NO_COLOR=1 ${baseCommand} "$@" 2>&1 | tee "$TEST_RESULTS_DIR/results-\${TIMESTAMP}.txt"`;
     default:
-      return `FORCE_COLOR=1 ${baseCommand} "$@"`;
+      return `${baseCommand} "$@"`;
   }
 }
 function getFrameworkImports(framework) {
@@ -2419,35 +2448,39 @@ function getFrameworkImports(framework) {
       return "import { describe, it, expect, beforeAll, afterAll } from 'vitest';";
   }
 }
-function generateSampleData(table, hasForeignKeys = false) {
+function generateSampleDataFromSchema(table, hasForeignKeys = false) {
   const fields = [];
   const foreignKeyColumns = new Map;
   if (hasForeignKeys) {
     for (const fk of table.fks) {
-      if (fk.from.length === 1 && fk.from[0]) {
-        foreignKeyColumns.set(fk.from[0], fk.toTable);
+      for (let i = 0;i < fk.from.length; i++) {
+        const fromCol = fk.from[i];
+        if (fromCol) {
+          foreignKeyColumns.set(fromCol, fk.toTable);
+        }
       }
     }
   }
   for (const col of table.columns) {
-    if (col.name === "id" && col.hasDefault) {
-      continue;
-    }
-    if ((col.name === "created_at" || col.name === "updated_at") && col.hasDefault) {
+    const isAutoGenerated = col.hasDefault && ["id", "created_at", "updated_at", "created", "updated", "modified_at"].includes(col.name.toLowerCase());
+    if (isAutoGenerated) {
       continue;
     }
-    if (col.name === "deleted_at") {
+    if (col.name === "deleted_at" || col.name === "deleted") {
+      if (col.nullable) {
+        fields.push(`    ${col.name}: null`);
+      } else {
+        const value = generateValueForColumn(col);
+        fields.push(`    ${col.name}: ${value}`);
+      }
       continue;
     }
-    if (!col.nullable) {
-      const foreignTable = foreignKeyColumns.get(col.name);
-      const value = foreignTable ? `${foreignTable}Id` : getSampleValue(col.pgType, col.name);
-      fields.push(`    ${col.name}: ${value}`);
-    } else {
-      const isImportant = col.name.endsWith("_id") || col.name.endsWith("_by") || col.name.includes("email") || col.name.includes("name") || col.name.includes("phone") || col.name.includes("address") || col.name.includes("description") || col.name.includes("color") || col.name.includes("type") || col.name.includes("status") || col.name.includes("subject");
-      if (isImportant) {
-        const foreignTable = foreignKeyColumns.get(col.name);
-        const value = foreignTable ? `${foreignTable}Id` : getSampleValue(col.pgType, col.name);
+    const foreignTable = foreignKeyColumns.get(col.name);
+    if (!col.nullable || foreignTable || col.hasDefault && !isAutoGenerated || shouldIncludeNullableColumn(col)) {
+      if (foreignTable) {
+        fields.push(`    ${col.name}: ${foreignTable}Id`);
+      } else {
+        const value = generateValueForColumn(col);
         fields.push(`    ${col.name}: ${value}`);
       }
     }
@@ -2457,14 +2490,23 @@ ${fields.join(`,
 `)}
   }` : "{}";
 }
-function generateUpdateData(table) {
+function generateUpdateDataFromSchema(table) {
   const fields = [];
   for (const col of table.columns) {
-    if (col.hasDefault || col.name === "id" || col.name === "created_at" || col.name === "updated_at") {
+    if (table.pk.includes(col.name) || col.hasDefault) {
+      const autoGenerated = ["id", "created_at", "updated_at", "created", "updated", "modified_at"];
+      if (autoGenerated.includes(col.name.toLowerCase())) {
+        continue;
+      }
+    }
+    if (col.name.endsWith("_id")) {
       continue;
     }
-    if (!col.nullable && fields.length === 0) {
-      const value = getSampleValue(col.pgType, col.name, true);
+    if (col.name === "deleted_at" || col.name === "deleted") {
+      continue;
+    }
+    if (!col.nullable || shouldIncludeNullableColumn(col)) {
+      const value = generateValueForColumn(col, true);
       fields.push(`    ${col.name}: ${value}`);
       break;
     }
@@ -2474,104 +2516,150 @@ ${fields.join(`,
 `)}
   }` : "{}";
 }
-function getSampleValue(type, name, isUpdate = false) {
-  const suffix = isUpdate ? ' + " (updated)"' : "";
-  if (name.endsWith("_id") || name.endsWith("_by")) {
-    return `'550e8400-e29b-41d4-a716-446655440000'`;
-  }
-  if (name.includes("email")) {
-    return `'test${isUpdate ? ".updated" : ""}@example.com'`;
-  }
-  if (name === "color") {
-    return `'#${isUpdate ? "FF0000" : "0000FF"}'`;
-  }
-  if (name === "gender") {
-    return `'${isUpdate ? "F" : "M"}'`;
-  }
-  if (name.includes("phone")) {
-    return `'${isUpdate ? "555-0200" : "555-0100"}'`;
-  }
-  if (name.includes("address")) {
-    return `'123 ${isUpdate ? "Updated" : "Test"} Street'`;
-  }
-  if (name === "type" || name === "status") {
-    return `'${isUpdate ? "updated" : "active"}'`;
-  }
-  if (name === "subject") {
-    return `'Test Subject${isUpdate ? " Updated" : ""}'`;
-  }
-  if (name.includes("name") || name.includes("title")) {
-    return `'Test ${pascal(name)}'${suffix}`;
-  }
-  if (name.includes("description") || name.includes("bio") || name.includes("content")) {
-    return `'Test description'${suffix}`;
-  }
-  if (name.includes("preferences") || name.includes("settings")) {
-    return `'Test preferences'${suffix}`;
-  }
-  if (name.includes("restrictions") || name.includes("dietary")) {
-    return `['vegetarian']`;
-  }
-  if (name.includes("location") || name.includes("clinic")) {
-    return `'Test Location'${suffix}`;
-  }
-  if (name.includes("specialty")) {
-    return `'General'`;
-  }
-  if (name.includes("tier")) {
-    return `'Standard'`;
-  }
-  if (name.includes("emergency")) {
-    return `'Emergency Contact ${isUpdate ? "Updated" : "Name"}'`;
-  }
-  if (name === "date_of_birth" || name.includes("birth")) {
-    return `new Date('1990-01-01')`;
-  }
-  if (name.includes("accommodations")) {
-    return `'No special accommodations'`;
-  }
-  if (name.includes("flight")) {
-    return `'Economy'`;
-  }
+function shouldIncludeNullableColumn(col) {
+  const importantPatterns = [
+    "_id",
+    "_by",
+    "email",
+    "name",
+    "title",
+    "description",
+    "phone",
+    "address",
+    "status",
+    "type",
+    "category",
+    "price",
+    "amount",
+    "quantity",
+    "url",
+    "slug"
+  ];
+  const name = col.name.toLowerCase();
+  return importantPatterns.some((pattern) => name.includes(pattern));
+}
+function generateValueForColumn(col, isUpdate = false) {
+  const type = col.pgType.toLowerCase();
   switch (type) {
     case "text":
     case "varchar":
     case "char":
-      return `'test_value'${suffix}`;
+    case "character varying":
+    case "bpchar":
+    case "name":
+      return `'str_${Math.random().toString(36).substring(7)}'`;
     case "int":
+    case "int2":
+    case "int4":
+    case "int8":
     case "integer":
     case "smallint":
     case "bigint":
+    case "serial":
+    case "bigserial":
       return isUpdate ? "42" : "1";
     case "decimal":
     case "numeric":
     case "real":
     case "double precision":
     case "float":
+    case "float4":
+    case "float8":
+    case "money":
       return isUpdate ? "99.99" : "10.50";
     case "boolean":
     case "bool":
       return isUpdate ? "false" : "true";
     case "date":
-      return `'2024-01-01'`;
     case "timestamp":
     case "timestamptz":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "time":
+    case "timetz":
+    case "time without time zone":
+    case "time with time zone":
       return `new Date()`;
+    case "interval":
+      return `'1 day'`;
     case "json":
     case "jsonb":
-      return `{ key: 'value' }`;
+      return `{}`;
     case "uuid":
-      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
-    case "text[]":
-    case "varchar[]":
-      return `['item1', 'item2']`;
+      return `'${generateUUID()}'`;
+    case "inet":
+      return `'192.168.1.1'`;
+    case "cidr":
+      return `'192.168.1.0/24'`;
+    case "macaddr":
+    case "macaddr8":
+      return `'08:00:2b:01:02:03'`;
+    case "point":
+      return `'(1,2)'`;
+    case "line":
+      return `'{1,2,3}'`;
+    case "lseg":
+      return `'[(0,0),(1,1)]'`;
+    case "box":
+      return `'((0,0),(1,1))'`;
+    case "path":
+      return `'[(0,0),(1,1),(2,0)]'`;
+    case "polygon":
+      return `'((0,0),(1,1),(1,0))'`;
+    case "circle":
+      return `'<(0,0),1>'`;
+    case "bit":
+    case "bit varying":
+    case "varbit":
+      return `'101'`;
+    case "bytea":
+      return `'\\\\x0102'`;
+    case "xml":
+      return `'<root/>'`;
+    case "tsvector":
+      return `'a fat cat'`;
+    case "tsquery":
+      return `'fat & cat'`;
+    case "oid":
+    case "regproc":
+    case "regprocedure":
+    case "regoper":
+    case "regoperator":
+    case "regclass":
+    case "regtype":
+    case "regconfig":
+    case "regdictionary":
+      return "1";
     default:
-      return `'test'`;
+      if (type.endsWith("[]") || type.startsWith("_")) {
+        return `[]`;
+      }
+      return `'value1'`;
   }
 }
+function generateUUID() {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+    const r = Math.random() * 16 | 0;
+    const v = c === "x" ? r : r & 3 | 8;
+    return v.toString(16);
+  });
+}
 function generateTestCases(table, sampleData, updateData, hasForeignKeys = false) {
   const Type = pascal(table.name);
   const hasData = sampleData !== "{}";
+  const isJunctionTable = table.pk.length > 1 && table.columns.every((col) => table.pk.includes(col.name) || col.name.endsWith("_id"));
+  if (isJunctionTable) {
+    return `it('should create a ${table.name} relationship', async () => {
+    // This is a junction table for M:N relationships
+    // Test data depends on parent records created in other tests
+    expect(true).toBe(true);
+  });
+  
+  it('should list ${table.name} relationships', async () => {
+    const list = await sdk.${table.name}.list({ limit: 10 });
+    expect(Array.isArray(list)).toBe(true);
+  });`;
+  }
   return `it('should create a ${table.name}', async () => {
     const data: Insert${Type} = ${sampleData};
     ${hasData ? `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {