Fix formatting handling for IF EXISTS in CREATE queries.

xterao · xterao · commit a77df00b42ec · 2025-09-01T17:19:36.000+09:00
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/conflict/SqlDoGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/conflict/SqlDoGroupBlock.kt
@@ -19,7 +19,6 @@ import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlTableModifySecondGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlTableModificationKeyword
 import org.domaframework.doma.intellij.formatter.util.IndentType
 import org.domaframework.doma.intellij.formatter.util.SqlBlockFormattingContext
 
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionKeywordGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/condition/SqlConditionKeywordGroupBlock.kt
@@ -18,6 +18,7 @@ package org.domaframework.doma.intellij.formatter.block.group.keyword.condition
 import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.option.SqlSecondOptionKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlWhereGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.subgroup.SqlSubGroupBlock
@@ -30,9 +31,9 @@ class SqlConditionKeywordGroupBlock(
     node: ASTNode,
     context: SqlBlockFormattingContext,
 ) : SqlSecondOptionKeywordGroupBlock(
-        node,
-        context,
-    ) {
+    node,
+    context,
+) {
     var conditionalExpressionGroupBlock: SqlConditionalExpressionGroupBlock? = null
 
     override fun setParentGroupBlock(lastGroup: SqlBlock?) {
@@ -74,4 +75,11 @@ class SqlConditionKeywordGroupBlock(
         }
         return 0
     }
+
+    override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
+        if (lastGroup is SqlCreateKeywordGroupBlock) {
+            return false
+        }
+        return super.isSaveSpace(lastGroup)
+    }
 }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/option/SqlExistsGroupBlock.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/block/group/keyword/option/SqlExistsGroupBlock.kt
@@ -19,7 +19,7 @@ import com.intellij.lang.ASTNode
 import org.domaframework.doma.intellij.formatter.block.SqlBlock
 import org.domaframework.doma.intellij.formatter.block.comment.SqlElConditionLoopCommentBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.SqlKeywordGroupBlock
-import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateTableColumnDefinitionRawGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlTableModifySecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.top.SqlTableModificationKeyword
 import org.domaframework.doma.intellij.formatter.util.IndentType
@@ -50,8 +50,9 @@ class SqlExistsGroupBlock(
     }
 
     override fun isSaveSpace(lastGroup: SqlBlock?): Boolean {
-        if (lastGroup is SqlCreateTableColumnDefinitionRawGroupBlock ||
-            lastGroup is SqlTableModifySecondGroupBlock
+        if (lastGroup is SqlTableModificationKeyword ||
+            lastGroup is SqlTableModifySecondGroupBlock ||
+            lastGroup is SqlCreateKeywordGroupBlock
         ) {
             return false
         }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockGenerator.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlBlockGenerator.kt
@@ -47,6 +47,7 @@ import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlC
 import org.domaframework.doma.intellij.formatter.block.group.keyword.create.SqlCreateTableColumnDefinitionRawGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.inline.SqlInlineSecondGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.insert.SqlInsertQueryGroupBlock
+import org.domaframework.doma.intellij.formatter.block.group.keyword.option.SqlExistsGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.option.SqlSecondOptionKeywordGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlFromGroupBlock
 import org.domaframework.doma.intellij.formatter.block.group.keyword.second.SqlSecondKeywordBlock
@@ -310,17 +311,32 @@ class SqlBlockGenerator(
                             child,
                             sqlBlockFormattingCtx,
                         )
-                    } else {
+                    } else if ( rootBlock is SqlExistsGroupBlock){
+                        SqlKeywordBlock(
+                            child,
+                            IndentType.ATTACHED,
+                            sqlBlockFormattingCtx,
+                        )
+                    }
+                    else {
                         SqlConflictClauseBlock(
                             child,
                             sqlBlockFormattingCtx,
                         )
                     }
                 } else if (SqlKeywordUtil.isConditionKeyword(keywordText)) {
-                    SqlConditionKeywordGroupBlock(
-                        child,
-                        sqlBlockFormattingCtx,
-                    )
+                   if(lastGroupBlock is SqlCreateKeywordGroupBlock){
+                       SqlKeywordBlock(
+                            child,
+                            IndentType.ATTACHED,
+                            sqlBlockFormattingCtx,
+                       )
+                   }else {
+                       SqlConditionKeywordGroupBlock(
+                           child,
+                           sqlBlockFormattingCtx,
+                       )
+                   }
                 } else {
                     SqlSecondOptionKeywordGroupBlock(
                         child,
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlKeywordUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/util/SqlKeywordUtil.kt
@@ -334,7 +334,7 @@ class SqlKeywordUtil {
                 "group" to setOf("within"),
                 "by" to setOf("group", "order", "first", "partition"),
                 "and" to setOf("between", "preceding"),
-                "if" to setOf("table", "create"),
+               // "if" to setOf("table", "index","view"),
                 "exists" to setOf("if", "where"),
                 "conflict" to setOf("on"),
                 "nothing" to setOf("do"),
diff --git a/src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt b/src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt
@@ -90,6 +90,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("CreateView.sql", "CreateView$formatDataPrefix.sql")
     }
 
+    fun testCreateViewOrReplaceFormatter() {
+        formatSqlFile("CreateViewOrReplace.sql", "CreateViewOrReplace$formatDataPrefix.sql")
+    }
+
     fun testInsertFormatter() {
         formatSqlFile("Insert.sql", "Insert$formatDataPrefix.sql")
     }
diff --git a/src/test/testData/sql/formatter/AlterTableAddColumn_format.sql b/src/test/testData/sql/formatter/AlterTableAddColumn_format.sql
@@ -1,8 +1,8 @@
- ALTER TABLE /*# tableName */
-         /*%for column : columns */
-         ADD COLUMN IF NOT EXISTS /*# column.name */ /*# column.type */
-           /*%if column_has_next */
-           ,
-           /*%end */
-         /*%end */
-         DROP COLUMN /*# column2.name */ /*# column2.type */
+ALTER TABLE /*# tableName */
+        /*%for column : columns */
+        ADD COLUMN IF NOT EXISTS /*# column.name */ /*# column.type */
+          /*%if column_has_next */
+          ,
+          /*%end */
+        /*%end */
+        DROP COLUMN /*# column2.name */ /*# column2.type */
diff --git a/src/test/testData/sql/formatter/CreateViewOrReplace.sql b/src/test/testData/sql/formatter/CreateViewOrReplace.sql
@@ -0,0 +1,8 @@
+CREATE 
+    OR REPLACE VIEW employee_view AS
+  SELECT id
+         , name
+         , department
+         , salary
+    FROM employees
+   WHERE active = true
diff --git a/src/test/testData/sql/formatter/CreateViewOrReplace_format.sql b/src/test/testData/sql/formatter/CreateViewOrReplace_format.sql
@@ -0,0 +1,8 @@
+CREATE OR REPLACE VIEW employee_view
+AS
+  SELECT id
+         , name
+         , department
+         , salary
+    FROM employees
+   WHERE active = true

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,10 @@ class SqlFormatterTest : BasePlatformTestCase() {`
`90`	`90`	`formatSqlFile("CreateView.sql", "CreateView$formatDataPrefix.sql")`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ fun testCreateViewOrReplaceFormatter() {`
	`94`	`+ formatSqlFile("CreateViewOrReplace.sql", "CreateViewOrReplace$formatDataPrefix.sql")`
	`95`	`+ }`
	`96`	`+`
`93`	`97`	`fun testInsertFormatter() {`
`94`	`98`	`formatSqlFile("Insert.sql", "Insert$formatDataPrefix.sql")`
`95`	`99`	`}`