supatool 0.3.1 → 0.3.2

package/README.md

@@ -285,6 +285,43 @@ supatool extract --all -c "postgresql://..." -o supabase/schemas
 
 ## Changelog
 
+### v0.3.2
+
+- **ENHANCED**: Adjust for extensions(vector, geometry etc.)
+- **FIXED**: USER-DEFINED column types are now rendered with full type definitions (e.g. `vector(1536)`, `geometry(Point,4326)`).
+- **ADDED**: `FOREIGN KEY` constraints are now included as `CONSTRAINT ... FOREIGN KEY ... REFERENCES ...` inside generated `CREATE TABLE` statements.
+
+### v0.3.0
+
+**NEW Features:**
+- **NEW**: `extract` command for database schema extraction
+- **NEW**: Full compliance with Supabase declarative database schemas workflow
+- **NEW**: AI-friendly index.md and llms.txt generation for better schema understanding
+- **NEW**: Database comment extraction and integration
+- **NEW**: Organized directory structure (tables/, views/, rls/, rpc/)
+- **NEW**: Pattern matching for selective extraction
+- **ENHANCED**: Support for all database object types (RLS, functions, triggers, cron jobs, custom types)
+- **ENHANCED**: Flexible output options with --no-separate compatibility
+
+**Enhanced Error Handling:**
+- Comprehensive try-catch blocks for all CRUD operations
+- Enhanced null/undefined checks with proper fallbacks
+- Detailed error messages with contextual information
+- Special handling for PGRST116 errors (record not found)
+- Parameter validation for required fields
+- Proper error logging and debugging support
+
+**Breaking Changes:**
+- **Function Parameter Format**: All CRUD functions now use destructuring assignment
+  - Before: `selectTableRowById(id: string)`
+  - After: `selectTableRowById({ id }: { id: string })`
+- **Type Safety**: Enhanced TypeScript type annotations for all functions
+
+### v0.2.0
+- Added `gen:` commands for code and schema generation
+- Enhanced `create` command  
+- Introduced model schema support (`schemas/supatool-data.schema.ts`)
+
 ## Database Comments
 
 Supatool automatically extracts and includes PostgreSQL comments in all generated files. Comments enhance documentation and AI understanding of your schema.
@@ -317,37 +354,4 @@ Comments appear in:
 ## Tables
 - [users](tables/users.sql) - User account information and authentication data
 - [posts](tables/posts.sql) - User-generated content and blog posts
-```
-
-## Changelog
-
-### v0.3.0
-
-**NEW Features:**
-- **NEW**: `extract` command for database schema extraction
-- **NEW**: Full compliance with Supabase declarative database schemas workflow
-- **NEW**: AI-friendly index.md and llms.txt generation for better schema understanding
-- **NEW**: Database comment extraction and integration
-- **NEW**: Organized directory structure (tables/, views/, rls/, rpc/)
-- **NEW**: Pattern matching for selective extraction
-- **ENHANCED**: Support for all database object types (RLS, functions, triggers, cron jobs, custom types)
-- **ENHANCED**: Flexible output options with --no-separate compatibility
-
-**Enhanced Error Handling:**
-- Comprehensive try-catch blocks for all CRUD operations
-- Enhanced null/undefined checks with proper fallbacks
-- Detailed error messages with contextual information
-- Special handling for PGRST116 errors (record not found)
-- Parameter validation for required fields
-- Proper error logging and debugging support
-
-**Breaking Changes:**
-- **Function Parameter Format**: All CRUD functions now use destructuring assignment
-  - Before: `selectTableRowById(id: string)`
-  - After: `selectTableRowById({ id }: { id: string })`
-- **Type Safety**: Enhanced TypeScript type annotations for all functions
-
-### v0.2.0
-- Added `gen:` commands for code and schema generation
-- Enhanced `create` command  
-- Introduced model schema support (`schemas/supatool-data.schema.ts`)
+```

package/dist/generator/sqlGenerator.js

@@ -49,6 +49,7 @@ function generateSqlFromModel(model, outPath) {
         let userIdCount = userIdFields.length;
         sql += `CREATE TABLE ${tableName} (\n`;
         const colDefs = [];
+        const tableConstraints = [];
         for (const [colName, col] of Object.entries(t.fields || {})) {
             const c = col;
             let actualColName = colName;
@@ -66,18 +67,23 @@ function generateSqlFromModel(model, outPath) {
             let def = `  ${actualColName} ${toSqlType(c.type, actualColName)}`;
             if (c.primary)
                 def += ' PRIMARY KEY';
+            if (c.unique)
+                def += ' UNIQUE';
             if (c.notNull)
                 def += ' NOT NULL';
             if (c.default)
                 def += ` DEFAULT ${c.default}`;
-            // 外部キー制約はREFERENCESで付与
+            // 外部キー制約はテーブル末尾に付与するため保留
+            colDefs.push(def);
+            // 外部キー制約をテーブル末尾に格納
             if (c.ref) {
                 const refTable = c.ref.split('.')[0];
-                def += ` REFERENCES ${refTable}(id)`;
+                tableConstraints.push(`  FOREIGN KEY (${actualColName}) REFERENCES ${refTable}(id)`);
             }
-            colDefs.push(def);
         }
-        sql += colDefs.join(',\n') + '\n);\n\n';
+        // 列定義 + テーブルレベル制約を結合
+        const defs = [...colDefs, ...tableConstraints];
+        sql += defs.join(',\n') + '\n);\n\n';
         // ALTER TABLEによる外部キー制約は出力しない
         sql += '\n';
     }
@@ -89,12 +95,20 @@ function toSqlType(type, colName) {
     // 時刻列は必ずtimestamptz
     if (type === 'timestamp' || type === 'timestamptz' || colName.endsWith('_at'))
         return 'timestamptz';
+    // vector型サポート
+    if (/^vector(\(\d+\))?$/i.test(type))
+        return type;
+    // extensions.vector → vector へ変換
+    const extVectorMatch = type.match(/^extensions\.vector(\(\d+\))?$/i);
+    if (extVectorMatch) {
+        return `vector${extVectorMatch[1] || ''}`;
+    }
     switch (type) {
         case 'uuid': return 'uuid';
         case 'text': return 'text';
         case 'int':
         case 'integer': return 'integer';
         case 'boolean': return 'boolean';
-        default: return 'text';
+        default: return type; // 指定が未知の場合はそのまま返す
     }
 }

package/dist/sync/definitionExtractor.js

@@ -717,19 +717,24 @@ async function fetchTableDefinitions(client, spinner, progress, schemas = ['publ
  */
 async function generateCreateTableDDL(client, tableName, schemaName = 'public') {
     // 全てのクエリを並行実行
-    const [columnsResult, primaryKeyResult, tableCommentResult, columnCommentsResult, uniqueConstraintResult] = await Promise.all([
+    const [columnsResult, primaryKeyResult, tableCommentResult, columnCommentsResult, uniqueConstraintResult, foreignKeyResult] = await Promise.all([
         // カラム情報を取得
         client.query(`
       SELECT 
-        column_name,
-        data_type,
-        character_maximum_length,
-        is_nullable,
-        column_default
-      FROM information_schema.columns 
-      WHERE table_schema = $1 
-        AND table_name = $2
-      ORDER BY ordinal_position
+        c.column_name,
+        c.data_type,
+        c.udt_name,
+        c.character_maximum_length,
+        c.is_nullable,
+        c.column_default,
+        pg_catalog.format_type(a.atttypid, a.atttypmod) AS full_type
+      FROM information_schema.columns c
+      JOIN pg_class cl ON cl.relname = c.table_name
+      JOIN pg_namespace ns ON ns.nspname = c.table_schema AND ns.oid = cl.relnamespace
+      JOIN pg_attribute a ON a.attrelid = cl.oid AND a.attname = c.column_name
+      WHERE c.table_schema = $1 
+        AND c.table_name = $2
+      ORDER BY c.ordinal_position
     `, [schemaName, tableName]),
         // 主キー情報を取得
         client.query(`
@@ -776,6 +781,25 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
         AND tc.constraint_type = 'UNIQUE'
       GROUP BY tc.constraint_name
       ORDER BY tc.constraint_name
+    `, [schemaName, tableName]),
+        // FOREIGN KEY制約を取得
+        client.query(`
+      SELECT 
+        tc.constraint_name,
+        string_agg(kcu.column_name, ', ' ORDER BY kcu.ordinal_position) as columns,
+        ccu.table_schema AS foreign_table_schema,
+        ccu.table_name AS foreign_table_name,
+        string_agg(ccu.column_name, ', ' ORDER BY kcu.ordinal_position) as foreign_columns
+      FROM information_schema.table_constraints tc
+      JOIN information_schema.key_column_usage kcu 
+        ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
+      JOIN information_schema.constraint_column_usage ccu 
+        ON tc.constraint_name = ccu.constraint_name AND tc.table_schema = ccu.table_schema
+      WHERE tc.table_schema = $1
+        AND tc.table_name = $2
+        AND tc.constraint_type = 'FOREIGN KEY'
+      GROUP BY tc.constraint_name, ccu.table_schema, ccu.table_name
+      ORDER BY tc.constraint_name
     `, [schemaName, tableName])
     ]);
     const columnComments = new Map();
@@ -798,7 +822,9 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
     ddl += `CREATE TABLE IF NOT EXISTS ${tableName} (\n`;
     const columnDefs = [];
     for (const col of columnsResult.rows) {
-        let colDef = `  ${col.column_name} ${col.data_type.toUpperCase()}`;
+        const rawType = col.full_type ||
+            ((col.data_type === 'USER-DEFINED' && col.udt_name) ? col.udt_name : col.data_type);
+        let colDef = `  ${col.column_name} ${rawType}`;
         // 長さ指定
         if (col.character_maximum_length) {
             colDef += `(${col.character_maximum_length})`;
@@ -823,6 +849,10 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
     for (const unique of uniqueConstraintResult.rows) {
         ddl += `,\n  CONSTRAINT ${unique.constraint_name} UNIQUE (${unique.columns})`;
     }
+    // FOREIGN KEY制約をCREATE TABLE内に追加
+    for (const fk of foreignKeyResult.rows) {
+        ddl += `,\n  CONSTRAINT ${fk.constraint_name} FOREIGN KEY (${fk.columns}) REFERENCES ${fk.foreign_table_schema}.${fk.foreign_table_name} (${fk.foreign_columns})`;
+    }
     ddl += '\n);\n';
     ddl += '\n';
     // カラムコメントを追加（スキーマ名を含む）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supatool",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "A CLI tool for Supabase schema extraction and TypeScript CRUD generation with declarative database schema support.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",