supatool 0.6.2 → 0.6.4

package/dist/sync/definitionExtractor.js

@@ -927,23 +927,30 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
       ORDER BY tc.constraint_name
     `, [schemaName, tableName]),
         // Get FOREIGN KEY constraints
+        // Use pg_constraint directly to avoid the N² row explosion that occurs when
+        // joining kcu × ccu on constraint_name alone for composite FKs.
         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
+      SELECT
+        c.conname AS constraint_name,
+        (SELECT string_agg(a.attname, ', ' ORDER BY u.ord)
+         FROM unnest(c.conkey) WITH ORDINALITY AS u(attnum, ord)
+         JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = u.attnum
+        ) AS columns,
+        fn.nspname AS foreign_table_schema,
+        fc.relname AS foreign_table_name,
+        (SELECT string_agg(a.attname, ', ' ORDER BY u.ord)
+         FROM unnest(c.confkey) WITH ORDINALITY AS u(attnum, ord)
+         JOIN pg_attribute a ON a.attrelid = c.confrelid AND a.attnum = u.attnum
+        ) AS foreign_columns
+      FROM pg_constraint c
+      JOIN pg_class rel ON rel.oid = c.conrelid
+      JOIN pg_namespace nsp ON nsp.oid = rel.relnamespace
+      JOIN pg_class fc ON fc.oid = c.confrelid
+      JOIN pg_namespace fn ON fn.oid = fc.relnamespace
+      WHERE c.contype = 'f'
+        AND nsp.nspname = $1
+        AND rel.relname = $2
+      ORDER BY c.conname
     `, [schemaName, tableName])
     ]);
     const columnComments = new Map();
@@ -1353,7 +1360,7 @@ async function generateIndexFile(definitions, outputDir, separateDirectories = t
             }
             : undefined
     };
-    writeFileIfChanged(path.join(outputDir, 'schema_index.json'), JSON.stringify(schemaIndex, null, 2) + '\n');
+    writeFileIfChanged(path.join(outputDir, 'schema_index.json'), JSON.stringify(schemaIndex, null, 2));
     // schema_summary.md (one-file overview for AI) — include RLS status per table
     let summaryMd = '# Schema summary\n\n';
     const tableDefs = definitions.filter(d => d.type === 'table' || d.type === 'view');
@@ -1389,6 +1396,7 @@ async function generateIndexFile(definitions, outputDir, separateDirectories = t
     writeFileIfChanged(path.join(outputDir, 'schema_summary.md'), summaryMd);
     // RLS disabled tables warning doc (tables only; RLS enabled with 0 policies is not warned)
     const rlsNotEnabled = tableRlsStatus.filter(s => !s.rlsEnabled);
+    const rlsWarningsPath = path.join(outputDir, 'rls_warnings.md');
     if (rlsNotEnabled.length > 0) {
         let warnMd = '# Tables with RLS disabled (warning)\n\n';
         warnMd += 'The following tables do not have Row Level Security enabled.\n';
@@ -1397,7 +1405,11 @@ async function generateIndexFile(definitions, outputDir, separateDirectories = t
         rlsNotEnabled.forEach(s => {
             warnMd += `| ${s.schema} | ${s.table} |\n`;
         });
-        writeFileIfChanged(path.join(outputDir, 'rls_warnings.md'), warnMd);
+        writeFileIfChanged(rlsWarningsPath, warnMd);
+    }
+    else if (fs.existsSync(rlsWarningsPath)) {
+        // All RLS issues resolved — remove stale warning file
+        fs.unlinkSync(rlsWarningsPath);
     }
 }
 /**
@@ -1529,7 +1541,10 @@ async function extractDefinitions(options) {
             cronJobs: { current: 0, total: 0 },
             customTypes: { current: 0, total: 0 }
         };
-        if (all) {
+        // --schema-only implies full extraction of all object types for the target schema,
+        // so that --force does not incorrectly delete rpc/cron/types files.
+        const effectiveAll = all || schemaOnly;
+        if (effectiveAll) {
             // Get total count for each object type first
             spinner.text = 'Counting database objects...';
             // Get total tables/views count
@@ -1591,7 +1606,7 @@ async function extractDefinitions(options) {
           AND t.typname NOT LIKE '_%'
       `);
             progress.customTypes.total = parseInt(typesCountResult.rows[0].count);
-            // When --all: fetch all objects (sequential)
+            // When --all / --schema-only: fetch all objects (sequential)
             const tables = await fetchTableDefinitions(client, spinner, progress, schemas);
             const rlsPolicies = await fetchRlsPolicies(client, spinner, progress, schemas);
             const functions = await fetchFunctions(client, spinner, progress, schemas);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supatool",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "CLI for PostgreSQL (Cloud SQL / Supabase): extract schema to files, deploy schema diffs, apply migrations, seed export.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",