Merge pull request #329 from domaframework/feature/sql-format-sub-group-spacing

Fix Value Group Format Rules for Bulk Update Queries

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/block/SqlRightPatternBlock.kt

@@ -82,7 +82,6 @@ open class SqlRightPatternBlock(
         val NEW_LINE_EXPECTED_TYPES =
             listOf(
                 SqlUpdateColumnGroupBlock::class,
-                SqlUpdateValueGroupBlock::class,
                 SqlCreateTableColumnDefinitionGroupBlock::class,
                 SqlColumnDefinitionRawGroupBlock::class,
                 SqlUpdateSetGroupBlock::class,

src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt

@@ -114,8 +114,8 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("UpdateBindVariable.sql", "UpdateBindVariable$formatDataPrefix.sql")
     }
 
-    fun testUpdateTupleAssignmentFormatter() {
-        formatSqlFile("UpdateTupleAssignment.sql", "UpdateTupleAssignment$formatDataPrefix.sql")
+    fun testUpdateBulkAssignmentFormatter() {
+        formatSqlFile("UpdateBulkAssignment.sql", "UpdateBulkAssignment$formatDataPrefix.sql")
     }
 
     fun testDeleteFormatter() {

src/test/testData/sql/formatter/UpdateTupleAssignment.sql renamed to src/test/testData/sql/formatter/UpdateBulkAssignment.sql

@@ -4,7 +4,7 @@ UPDATE /*# tableName */
       , x3
       /*%for entity : entities */
       , /*# entity.itemIdentifier */ 
-      /*%end*/) = ( /* @userId() */1
+      /*%end*/)=(/* @userId() */1
          , x
          , x + 1
          /*%for entity : entities */

src/test/testData/sql/formatter/UpdateTupleAssignment_format.sql renamed to src/test/testData/sql/formatter/UpdateBulkAssignment_format.sql

@@ -11,6 +11,5 @@ UPDATE /*# tableName */
            , x + 1
            /*%for entity : entities */
            , /* entity.value */'abc'
-           /*%end*/
-         )
+           /*%end*/ )
  WHERE x = /* reportId */1