supatool 0.6.3 → 0.6.5

package/dist/sync/definitionExtractor.js

@@ -885,7 +885,9 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
       SELECT column_name
       FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu 
-        ON tc.constraint_name = kcu.constraint_name
+        ON tc.constraint_catalog = kcu.constraint_catalog
+        AND tc.constraint_schema = kcu.constraint_schema
+        AND tc.constraint_name = kcu.constraint_name
       WHERE tc.table_schema = $1
         AND tc.table_name = $2
         AND tc.constraint_type = 'PRIMARY KEY'
@@ -919,7 +921,9 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
         string_agg(kcu.column_name, ', ' ORDER BY kcu.ordinal_position) as columns
       FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu 
-        ON tc.constraint_name = kcu.constraint_name
+        ON tc.constraint_catalog = kcu.constraint_catalog
+        AND tc.constraint_schema = kcu.constraint_schema
+        AND tc.constraint_name = kcu.constraint_name
       WHERE tc.table_schema = $1
         AND tc.table_name = $2
         AND tc.constraint_type = 'UNIQUE'
@@ -1360,7 +1364,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');
@@ -1396,6 +1400,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';
@@ -1404,7 +1409,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);
     }
 }
 /**
@@ -1536,7 +1545,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
@@ -1598,7 +1610,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.3",
+  "version": "0.6.5",
   "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",
@@ -9,7 +9,7 @@
   },
 "scripts": {
   "build": "tsc",
-  "test": "npm run build && node test/smoke.js",
+  "test": "npm run build && node test/smoke.js && node test/definition-extractor.js",
   "start": "tsx src/bin/supatool.ts",
   "local": "tsx src/bin/supatool.ts"
 },