From 6ca17ff0f01ef80b9d07c5e82b3f1d66e2e0a299 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Mon, 24 Mar 2025 16:27:39 +0100 Subject: [PATCH 1/2] Recognize CASCADE as keyword in ON UPDATE/DELETE --- src/languages/postgresql/postgresql.formatter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/postgresql/postgresql.formatter.ts b/src/languages/postgresql/postgresql.formatter.ts index 499ea9868..62413c481 100644 --- a/src/languages/postgresql/postgresql.formatter.ts +++ b/src/languages/postgresql/postgresql.formatter.ts @@ -251,7 +251,7 @@ const reservedJoins = expandPhrases([ const reservedPhrases = expandPhrases([ 'PRIMARY KEY', 'GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY', - 'ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]', + 'ON {UPDATE | DELETE} [CASCADE | SET NULL | SET DEFAULT]', 'DO {NOTHING | UPDATE}', 'AS MATERIALIZED', '{ROWS | RANGE | GROUPS} BETWEEN', From b298bdb09fb0d5c939d6e251e237fbb5f50afe95 Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Mon, 24 Mar 2025 17:00:02 +0100 Subject: [PATCH 2/2] Add NO ACTIONS, RESTRICT --- src/languages/postgresql/postgresql.formatter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/postgresql/postgresql.formatter.ts b/src/languages/postgresql/postgresql.formatter.ts index 62413c481..e46fddce8 100644 --- a/src/languages/postgresql/postgresql.formatter.ts +++ b/src/languages/postgresql/postgresql.formatter.ts @@ -251,7 +251,7 @@ const reservedJoins = expandPhrases([ const reservedPhrases = expandPhrases([ 'PRIMARY KEY', 'GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY', - 'ON {UPDATE | DELETE} [CASCADE | SET NULL | SET DEFAULT]', + 'ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]', 'DO {NOTHING | UPDATE}', 'AS MATERIALIZED', '{ROWS | RANGE | GROUPS} BETWEEN',