supatool 0.3.2 → 0.3.3

package/README.md

@@ -285,6 +285,12 @@ supatool extract --all -c "postgresql://..." -o supabase/schemas
 
 ## Changelog
 
+### v0.3.3
+
+- **ENHANCED**: Improved SQL comment placement (moved to end of each SQL statement)
+- **ENHANCED**: Unified comment format for tables, views, functions, and custom types
+- **FIXED**: Preserved view `security_invoker` settings
+
 ### v0.3.2
 
 - **ENHANCED**: Adjust for extensions(vector, geometry etc.)

package/dist/sync/definitionExtractor.js

@@ -230,14 +230,19 @@ async function fetchFunctions(client, spinner, progress, schemas = ['public']) {
         let ddl = '';
         if (!row.comment) {
             ddl += `-- Function: ${functionSignature}\n`;
-            ddl += `-- COMMENT ON FUNCTION ${functionSignature} IS '_your_comment_here_';\n\n`;
         }
         else {
             ddl += `-- ${row.comment}\n`;
-            ddl += `COMMENT ON FUNCTION ${functionSignature} IS '${row.comment}';\n\n`;
         }
         // 関数定義を追加
-        ddl += row.definition;
+        ddl += row.definition + '\n\n';
+        // COMMENT ON文を追加
+        if (!row.comment) {
+            ddl += `-- COMMENT ON FUNCTION ${functionSignature} IS '_your_comment_here_';\n\n`;
+        }
+        else {
+            ddl += `COMMENT ON FUNCTION ${functionSignature} IS '${row.comment}';\n\n`;
+        }
         functions.push({
             name: row.name,
             type: 'function',
@@ -469,17 +474,23 @@ async function fetchCustomTypes(client, spinner, progress, schemas = ['public'])
             }
         }
         if (ddl) {
-            // 型コメントを先頭に追加（スキーマ名を含む）
+            // 型コメントを先頭に追加
             let finalDdl = '';
             if (!row.comment) {
                 finalDdl += `-- Type: ${row.type_name}\n`;
-                finalDdl += `-- COMMENT ON TYPE ${row.schema_name}.${row.type_name} IS '_your_comment_here_';\n\n`;
             }
             else {
                 finalDdl += `-- ${row.comment}\n`;
+            }
+            // 型定義を追加
+            finalDdl += ddl + '\n\n';
+            // COMMENT ON文を追加
+            if (!row.comment) {
+                finalDdl += `-- COMMENT ON TYPE ${row.schema_name}.${row.type_name} IS '_your_comment_here_';\n\n`;
+            }
+            else {
                 finalDdl += `COMMENT ON TYPE ${row.schema_name}.${row.type_name} IS '${row.comment}';\n\n`;
             }
-            finalDdl += ddl;
             types.push({
                 name: `${row.schema_name}_${row.type_name}`,
                 type: 'type',
@@ -608,12 +619,11 @@ async function fetchTableDefinitions(client, spinner, progress, schemas = ['publ
                     if (viewCommentResult.rows.length > 0 && viewCommentResult.rows[0].view_comment) {
                         comment = viewCommentResult.rows[0].view_comment;
                         ddl = `-- ${comment}\n`;
-                        ddl += `COMMENT ON VIEW ${schemaName}.${name} IS '${comment}';\n\n`;
                     }
                     else {
                         ddl = `-- View: ${name}\n`;
-                        ddl += `-- COMMENT ON VIEW ${schemaName}.${name} IS '_your_comment_here_';\n\n`;
                     }
+                    // ビュー定義を追加
                     let ddlStart = `CREATE OR REPLACE VIEW ${name}`;
                     // security_invoker設定をチェック
                     if (view.reloptions) {
@@ -630,7 +640,14 @@ async function fetchTableDefinitions(client, spinner, progress, schemas = ['publ
                             }
                         }
                     }
-                    ddl += `${ddlStart} AS\n${view.definition}`;
+                    ddl += ddlStart + ' AS\n' + view.definition + ';\n\n';
+                    // COMMENT ON文を追加
+                    if (viewCommentResult.rows.length > 0 && viewCommentResult.rows[0].view_comment) {
+                        ddl += `COMMENT ON VIEW ${schemaName}.${name} IS '${comment}';\n\n`;
+                    }
+                    else {
+                        ddl += `-- COMMENT ON VIEW ${schemaName}.${name} IS '_your_comment_here_';\n\n`;
+                    }
                     // ビューの作成時刻を取得（可能であれば）
                     try {
                         const viewStatsResult = await client.query(`
@@ -652,8 +669,7 @@ async function fetchTableDefinitions(client, spinner, progress, schemas = ['publ
                 }
             }
             catch (error) {
-                console.error(`Failed to fetch view definition: ${name}`, error);
-                return null;
+                // エラーの場合はコメントなし
             }
         }
         return {
@@ -810,13 +826,12 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
     });
     // テーブルコメントを先頭に追加（スキーマ名を含む）
     let ddl = '';
+    // テーブルコメントを先頭に追加
     if (tableCommentResult.rows.length > 0 && tableCommentResult.rows[0].table_comment) {
         ddl += `-- ${tableCommentResult.rows[0].table_comment}\n`;
-        ddl += `COMMENT ON TABLE ${schemaName}.${tableName} IS '${tableCommentResult.rows[0].table_comment}';\n\n`;
     }
     else {
         ddl += `-- Table: ${tableName}\n`;
-        ddl += `-- COMMENT ON TABLE ${schemaName}.${tableName} IS '_your_comment_here_';\n\n`;
     }
     // CREATE TABLE文を生成
     ddl += `CREATE TABLE IF NOT EXISTS ${tableName} (\n`;
@@ -853,8 +868,14 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
     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';
+    ddl += '\n);\n\n';
+    // COMMENT ON文を追加
+    if (tableCommentResult.rows.length > 0 && tableCommentResult.rows[0].table_comment) {
+        ddl += `COMMENT ON TABLE ${schemaName}.${tableName} IS '${tableCommentResult.rows[0].table_comment}';\n\n`;
+    }
+    else {
+        ddl += `-- COMMENT ON TABLE ${schemaName}.${tableName} IS '_your_comment_here_';\n\n`;
+    }
     // カラムコメントを追加（スキーマ名を含む）
     if (columnComments.size > 0) {
         ddl += '\n-- カラムコメント\n';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supatool",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "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",