Merge pull request #272 from Trivadis/bugfix/issue-265-wrong-indent

Bugfix/issue 265 wrong indent

Author: PhilippSalvisberg

settings/sql_developer/trivadis_custom_format.arbori

@@ -3406,7 +3406,7 @@ r7_single_table_insert:
         | [keyword) 'RETURNING'
         | [keyword) 'LOG'
         | [keyword) 'REJECT'
-        | [keyword) 'SELECT' & ![keyword^^-1) '(' & ![keyword^^^-1) '('
+        | [keyword) 'SELECT' & ![keyword^^-1) '(' & ![keyword^^^-1) '(' & ![keyword^^^^-1) '('
       )
     & insert < keyword
     & parent < insert

standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_264_exit_in_whenever_oserror.java

@@ -4,12 +4,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
-import java.io.IOException;
-
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class Issue_264_exit_in_whenever_oserror extends ConfiguredTestFormatter {
     @Test
-    public void exit_in_whenever_os_error() throws IOException {
+    public void exit_in_whenever_os_error() {
         var input = """
                 whenever sqlerror exit failure
                 whenever oserror exit failure

standalone/src/test/java/com/trivadis/plsql/formatter/settings/tests/issues/Issue_265_wrong_indent_in_insert.java

@@ -0,0 +1,78 @@
+package com.trivadis.plsql.formatter.settings.tests.issues;
+
+import com.trivadis.plsql.formatter.settings.ConfiguredTestFormatter;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class Issue_265_wrong_indent_in_insert extends ConfiguredTestFormatter {
+    @Test
+    public void insert_from_subquery() {
+        var input = """
+                insert into t1
+                select object_type, count(*)
+                  from (
+                          select 'table' as object_type, table_name as object_name
+                            from user_tables
+                          union all
+                          select 'view', view_name
+                            from user_views
+                          union all
+                          select 'sequence', sequence_name
+                            from user_sequences
+                       )
+                 group by object_type;
+                """;
+        formatAndAssert(input);
+    }
+
+    @Test
+    public void insert_from_with_clause() {
+        var input = """
+                insert into t2
+                with
+                   objects as (
+                      select 'table' as object_type, table_name as object_name
+                        from user_tables
+                      union all
+                      select 'view', view_name
+                        from user_views
+                      union all
+                      select 'sequence', sequence_name
+                        from user_sequences
+                   )
+                select object_type, count(*)
+                  from objects
+                 group by object_type;
+                /
+                """;
+        formatAndAssert(input);
+    }
+
+    @Test
+    public void insert_from_with_clause_with_subquery() {
+        var input = """
+                insert into t3
+                with
+                   combined as (
+                      select object_type, count(*)
+                        from (
+                                select 'table' as object_type, table_name as object_name
+                                  from user_tables
+                                union all
+                                select 'view', view_name
+                                  from user_views
+                                union all
+                                select 'sequence', sequence_name
+                                  from user_sequences
+                             )
+                       group by object_type
+                   )
+                select *
+                  from combined;
+                /
+                """;
+        formatAndAssert(input);
+    }
+
+}