Fix indentation of SELECT ... INTO statements. Thanks to Amanda Graven for the report.

Author: darold

lib/pgFormatter/Beautify.pm

@@ -3755,6 +3755,17 @@ sub beautify {
 					$self->_over( $token, $last ) if ($self->{'_level_stack'}[-1]+1 != $self->{'_level'});
 				}
 
+				if ($self->{'_current_sql_stmt'} eq 'SELECT' and $token =~ /^INTO$/i)
+				{
+					$self->_back( $token, $last );
+					$self->_new_line( $token, $last );
+					# Finally add the token without further condition
+					$self->_add_token( $token, $last );
+					$self->_new_line( $token, $last );
+					$self->_over( $token, $last );
+					next;
+				}
+
 				# Finally add the token without further condition
 				$self->_add_token( $token, $last );
 

t/pg-test-files/expected/alter_table.sql

@@ -2176,7 +2176,9 @@ FROM
 DROP TABLE attest1;
 
 SELECT
-    * INTO attest2
+    *
+INTO
+    attest2
 FROM
     atacc1;
 

t/pg-test-files/expected/create_am.sql

@@ -169,7 +169,8 @@ ORDER BY
 
 -- SELECT INTO doesn't support USING
 SELECT
-    INTO tableam_tblselectinto_heap2
+INTO
+    tableam_tblselectinto_heap2
     USING heap2
 FROM
     tableam_tbl_heap2;
@@ -289,7 +290,8 @@ SELECT
 FROM
     tableam_tbl_heapx;
 SELECT
-    INTO tableam_tblselectinto_heapx
+INTO
+    tableam_tblselectinto_heapx
 FROM
     tableam_tbl_heapx;
 CREATE MATERIALIZED VIEW tableam_tblmv_heapx USING heap2 AS

t/pg-test-files/expected/create_index.sql

@@ -1469,7 +1469,9 @@ DROP TABLE syscol_table;
 --
 SELECT
     unique1,
-    unique2 INTO onek_with_null
+    unique2
+INTO
+    onek_with_null
 FROM
     onek;
 

t/pg-test-files/expected/create_misc.sql

@@ -11,7 +11,9 @@ FROM
     tenk1;
 
 SELECT
-    * INTO TABLE onek2
+    *
+INTO
+    TABLE onek2
 FROM
     onek;
 
@@ -22,7 +24,9 @@ FROM
     slow_emp4000;
 
 SELECT
-    * INTO TABLE Bprime
+    *
+INTO
+    TABLE Bprime
 FROM
     tenk1
 WHERE
@@ -71,7 +75,9 @@ VALUES
 TABLE city;
 
 SELECT
-    * INTO TABLE ramp
+    *
+INTO
+    TABLE ramp
 FROM
     road
 WHERE

t/pg-test-files/expected/fast_default.sql

@@ -65,7 +65,8 @@ DECLARE
     this_schema text;
 BEGIN
     SELECT
-        INTO this_schema relnamespace::regnamespace::text
+    INTO
+        this_schema relnamespace::regnamespace::text
     FROM
         pg_class
     WHERE

t/pg-test-files/expected/misc_sanity.sql

@@ -86,7 +86,9 @@ BEGIN
         AND oid < 16384
     ORDER BY
         1 LOOP
-            EXECUTE 'select min(oid) from ' || relnm INTO lowoid;
+            EXECUTE 'select min(oid) from ' || relnm
+        INTO
+            lowoid;
             CONTINUE
             WHEN lowoid IS NULL
                 OR lowoid >= 16384;

t/pg-test-files/expected/plancache.sql

@@ -109,7 +109,9 @@ INSERT INTO t1
 INSERT INTO t1
     VALUES (13);
     SELECT
-        sum(f1) INTO total
+        sum(f1)
+    INTO
+        total
     FROM
         t1;
     DROP TABLE t1;