Fix 'ON CONFLICT' Test Case.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/processor/SqlSetParentGroupProcessor.kt

@@ -179,7 +179,7 @@ class SqlSetParentGroupProcessor(
                     return@setParentGroups if (lastGroup is SqlUpdateQueryGroupBlock && lastGroup.parentBlock is SqlDoGroupBlock) {
                         lastGroup.parentBlock
                     } else {
-                        history.lastOrNull()
+                        lastGroup
                     }
                 }
                 return

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

@@ -66,6 +66,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("Insert.sql", "Insert$formatDataPrefix.sql")
     }
 
+    fun testInsertReturningFormatter() {
+        formatSqlFile("InsertReturning.sql", "InsertReturning$formatDataPrefix.sql")
+    }
+
     fun testInsertWithBindVariableFormatter() {
         formatSqlFile("InsertWithBindVariable.sql", "InsertWithBindVariable$formatDataPrefix.sql")
     }
@@ -74,6 +78,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("Update.sql", "Update$formatDataPrefix.sql")
     }
 
+    fun testUpdateReturningFormatter() {
+        formatSqlFile("UpdateReturning.sql", "UpdateReturning$formatDataPrefix.sql")
+    }
+
     fun testUpdateBindVariableFormatter() {
         formatSqlFile("UpdateBindVariable.sql", "UpdateBindVariable$formatDataPrefix.sql")
     }
@@ -82,10 +90,22 @@ class SqlFormatterTest : BasePlatformTestCase() {
         formatSqlFile("UpdateTupleAssignment.sql", "UpdateTupleAssignment$formatDataPrefix.sql")
     }
 
+    fun testUpdateTupleAssignmentSubQueryFormatter() {
+        formatSqlFile("UpdateTupleAssignmentSubQuery.sql", "UpdateTupleAssignmentSubQuery$formatDataPrefix.sql")
+    }
+
+    fun testUpdateTupleSubUseQueryRowFormatter() {
+        formatSqlFile("UpdateTupleSubUseQueryRow.sql", "UpdateTupleSubUseQueryRow$formatDataPrefix.sql")
+    }
+
     fun testDeleteFormatter() {
         formatSqlFile("Delete.sql", "Delete$formatDataPrefix.sql")
     }
 
+    fun testDeleteReturningFormatter() {
+        formatSqlFile("DeleteReturning.sql", "DeleteReturning$formatDataPrefix.sql")
+    }
+
     fun testInsertConflictUpdateFormatter() {
         formatSqlFile("InsertConflictUpdate.sql", "InsertConflictUpdate$formatDataPrefix.sql")
     }

src/test/testData/sql/formatter/InsertConflictNothing.sql

@@ -1,2 +1,2 @@
 insert into employee (id, username) values ( /* employees.id */0, /* employees.name */'name')
-on conflict (username) do nothing
+on conflict (username)  on Constraint do nothing

src/test/testData/sql/formatter/InsertConflictNothing_format.sql

@@ -3,5 +3,5 @@ INSERT INTO employee
              , username)
      VALUES ( /* employees.id */0
              , /* employees.name */'name')
-ON CONFLICT (username)
+ON CONFLICT (username) ON CONSTRAINT
 DO NOTHING 

src/test/testData/sql/formatter/InsertConflictUpdate_format.sql

@@ -10,8 +10,7 @@ ON CONFLICT (id)
 DO UPDATE
       SET name = EXCLUDED.name
           , email = DEFAULT
-    WHERE employees.name IS DISTINCT
-     FROM EXCLUDED.name
+    WHERE employees.name IS DISTINCT FROM EXCLUDED.name
 RETURNING id
           , manager_id
           , name