@supabase/pg-delta 1.0.0-alpha.30 → 1.0.0-alpha.31

package/dist/core/plan/sql-format/sql-scanner.d.ts

@@ -27,6 +27,16 @@ type WalkSqlOptions = {
      * called once with the full sequence.
      */
     onSkipped?: (chunk: string) => void;
+    /**
+     * Called once for each top-level double-quoted identifier, after its closing
+     * quote, with the index of the opening quote (`start`), the index just past
+     * the closing quote (`end`), and the parenthesis depth at the quote.
+     *
+     * Lets callers treat a quoted identifier (e.g. `"my-trigger"`) as an atomic
+     * token even though its interior is reported via `onSkipped`. Returning
+     * `false` stops the walk early, like `onTopLevel`.
+     */
+    onQuotedIdentifier?: (start: number, end: number, depth: number) => boolean;
 };
 /**
  * Fast character-code check: A-Z, a-z, 0-9, _

package/dist/core/plan/sql-format/sql-scanner.js

@@ -59,9 +59,11 @@ export function walkSql(text, onTopLevel, options) {
     const trackDepth = options?.trackDepth ?? false;
     const startIndex = options?.startIndex ?? 0;
     const onSkipped = options?.onSkipped;
+    const onQuotedIdentifier = options?.onQuotedIdentifier;
     let inSingleQuote = false;
     let singleQuoteEscapeMode = false;
     let inDoubleQuote = false;
+    let doubleQuoteStart = -1;
     let inLineComment = false;
     let inBlockComment = false;
     let dollarTag = null;
@@ -137,6 +139,12 @@ export function walkSql(text, onTopLevel, options) {
                     continue;
                 }
                 inDoubleQuote = false;
+                onSkipped?.(char);
+                if (onQuotedIdentifier?.(doubleQuoteStart, i + 1, depth) === false) {
+                    return;
+                }
+                i += 1;
+                continue;
             }
             onSkipped?.(char);
             i += 1;
@@ -164,6 +172,7 @@ export function walkSql(text, onTopLevel, options) {
         }
         if (char === '"') {
             inDoubleQuote = true;
+            doubleQuoteStart = i;
             onSkipped?.(char);
             i += 1;
             continue;

package/dist/core/plan/sql-format/tokenizer.js

@@ -23,7 +23,26 @@ export function scanTokens(statement) {
             skipUntil = end;
         }
         return true;
-    }, { trackDepth: true });
+    }, {
+        trackDepth: true,
+        // Double-quoted identifiers (e.g. `"my-trigger"`) are atomic tokens too.
+        // Without this, the walker skips their interior entirely and positional
+        // token logic (e.g. "the name follows the TRIGGER keyword") lands on the
+        // wrong token. The value keeps the surrounding quotes; a quoted
+        // identifier never matches a keyword, which is correct.
+        onQuotedIdentifier: (start, end, depth) => {
+            const value = statement.slice(start, end);
+            tokens.push({
+                value,
+                upper: value.toUpperCase(),
+                start,
+                end,
+                depth,
+            });
+            skipUntil = end;
+            return true;
+        },
+    });
     return tokens;
 }
 export function findTopLevelParen(statement, startIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supabase/pg-delta",
-  "version": "1.0.0-alpha.30",
+  "version": "1.0.0-alpha.31",
   "description": "PostgreSQL migrations made easy",
   "keywords": [
     "diff",
@@ -79,7 +79,7 @@
   },
   "dependencies": {
     "@stricli/core": "^1.2.4",
-    "@supabase/pg-topo": "^1.0.0-alpha.2",
+    "@supabase/pg-topo": "^1.0.0-alpha.3",
     "@ts-safeql/sql-tag": "^0.2.0",
     "chalk": "^5.6.2",
     "debug": "^4.3.7",

package/src/core/plan/sql-format/format-trigger-quoted-name.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it } from "bun:test";
+import { formatSqlStatements } from "./index.ts";
+
+describe("formatCreateTrigger with quoted (dashed) names", () => {
+  // Regression: CLI-1820. A trigger whose name contains characters that force
+  // PostgreSQL to double-quote it (e.g. a dash) used to lose its event/table
+  // clause ("AFTER INSERT ON public.t1"). The tokenizer emitted no token for
+  // the quoted identifier, so the formatter mistook the next keyword for the
+  // name and sliced away everything before the first recognized clause.
+  it("preserves the event/table clause for a dashed trigger name", () => {
+    const sql = `CREATE TRIGGER "new-webhook-with-dashed-name" AFTER INSERT ON public.t1 FOR EACH ROW EXECUTE FUNCTION supabase_functions.http_request('https://example.com/x', 'POST', '{}', '{}', '5000')`;
+
+    const [formatted] = formatSqlStatements([sql], { keywordCase: "upper" });
+
+    expect(formatted).toContain("AFTER INSERT ON public.t1");
+    expect(formatted).toMatchInlineSnapshot(`
+      "CREATE TRIGGER "new-webhook-with-dashed-name"
+        AFTER INSERT ON public.t1
+        FOR EACH ROW
+        EXECUTE FUNCTION
+          supabase_functions.http_request('https://example.com/x', 'POST', '{}', '{}', '5000')"
+    `);
+  });
+
+  it("formats a dashed trigger name the same way as an unquoted one", () => {
+    const dashed = `CREATE TRIGGER "send-chat-push" AFTER INSERT ON public.chat_message FOR EACH ROW EXECUTE FUNCTION public.notify()`;
+    const plain = `CREATE TRIGGER send_chat_push AFTER INSERT ON public.chat_message FOR EACH ROW EXECUTE FUNCTION public.notify()`;
+
+    const [dashedOut] = formatSqlStatements([dashed], { keywordCase: "upper" });
+    const [plainOut] = formatSqlStatements([plain], { keywordCase: "upper" });
+
+    expect(dashedOut.replace('"send-chat-push"', "send_chat_push")).toBe(
+      plainOut,
+    );
+  });
+});

package/src/core/plan/sql-format/sql-scanner.ts

@@ -29,6 +29,16 @@ type WalkSqlOptions = {
    * called once with the full sequence.
    */
   onSkipped?: (chunk: string) => void;
+  /**
+   * Called once for each top-level double-quoted identifier, after its closing
+   * quote, with the index of the opening quote (`start`), the index just past
+   * the closing quote (`end`), and the parenthesis depth at the quote.
+   *
+   * Lets callers treat a quoted identifier (e.g. `"my-trigger"`) as an atomic
+   * token even though its interior is reported via `onSkipped`. Returning
+   * `false` stops the walk early, like `onTopLevel`.
+   */
+  onQuotedIdentifier?: (start: number, end: number, depth: number) => boolean;
 };
 
 /**
@@ -104,10 +114,12 @@ export function walkSql(
   const trackDepth = options?.trackDepth ?? false;
   const startIndex = options?.startIndex ?? 0;
   const onSkipped = options?.onSkipped;
+  const onQuotedIdentifier = options?.onQuotedIdentifier;
 
   let inSingleQuote = false;
   let singleQuoteEscapeMode = false;
   let inDoubleQuote = false;
+  let doubleQuoteStart = -1;
   let inLineComment = false;
   let inBlockComment = false;
   let dollarTag: string | null = null;
@@ -187,6 +199,12 @@ export function walkSql(
           continue;
         }
         inDoubleQuote = false;
+        onSkipped?.(char);
+        if (onQuotedIdentifier?.(doubleQuoteStart, i + 1, depth) === false) {
+          return;
+        }
+        i += 1;
+        continue;
       }
       onSkipped?.(char);
       i += 1;
@@ -215,6 +233,7 @@ export function walkSql(
     }
     if (char === '"') {
       inDoubleQuote = true;
+      doubleQuoteStart = i;
       onSkipped?.(char);
       i += 1;
       continue;

package/src/core/plan/sql-format/tokenizer.test.ts

@@ -21,6 +21,22 @@ describe("scanTokens", () => {
     expect(inner[1].depth).toBe(1);
   });
 
+  it("emits a single token for a double-quoted identifier", () => {
+    const tokens = scanTokens('CREATE TRIGGER "send-chat-push" AFTER');
+    expect(tokens).toEqual([
+      { value: "CREATE", upper: "CREATE", start: 0, end: 6, depth: 0 },
+      { value: "TRIGGER", upper: "TRIGGER", start: 7, end: 14, depth: 0 },
+      {
+        value: '"send-chat-push"',
+        upper: '"SEND-CHAT-PUSH"',
+        start: 15,
+        end: 31,
+        depth: 0,
+      },
+      { value: "AFTER", upper: "AFTER", start: 32, end: 37, depth: 0 },
+    ]);
+  });
+
   it("ignores content in quotes, comments, and dollar-quotes", () => {
     const tokens = scanTokens("SELECT 'hello' -- comment\n FROM $$body$$ tbl");
     const uppers = tokens.map((t) => t.upper);

package/src/core/plan/sql-format/tokenizer.ts

@@ -27,7 +27,26 @@ export function scanTokens(statement: string): Token[] {
       }
       return true;
     },
-    { trackDepth: true },
+    {
+      trackDepth: true,
+      // Double-quoted identifiers (e.g. `"my-trigger"`) are atomic tokens too.
+      // Without this, the walker skips their interior entirely and positional
+      // token logic (e.g. "the name follows the TRIGGER keyword") lands on the
+      // wrong token. The value keeps the surrounding quotes; a quoted
+      // identifier never matches a keyword, which is correct.
+      onQuotedIdentifier: (start, end, depth) => {
+        const value = statement.slice(start, end);
+        tokens.push({
+          value,
+          upper: value.toUpperCase(),
+          start,
+          end,
+          depth,
+        });
+        skipUntil = end;
+        return true;
+      },
+    },
   );
 
   return tokens;