Merge pull request #387 from bkircher/fixes

fixes

Author: darold

lib/pgFormatter/Beautify.pm

@@ -404,6 +404,12 @@ s/AS ('[^\']+')\s*,\s*('[^\']+')/AS CODEPARTB${i}CODEPARTB/is
 	}
 	$self->{'query'} = join( '', @temp_content );
 
+	# replace all inline dollar-quoted constants
+	while ( $self->{'query'} =~ s/(\$\$\S[^\n\r]*?\$\$)/AAKEYWCONST${j}AA/s ) {
+		$self->{'keyword_constant'}{$j} = $1;
+		$j++;
+	}
+
  # Store values of code that must not be changed following the given placeholder
 	if ( $self->{'placeholder'} ) {
 		if ( !$self->{'multiline'} ) {
@@ -2218,7 +2224,7 @@ sub beautify {
 				  if ( !$self->{'wrap_after'} && !$self->{'_is_in_overlaps'} );
 				$self->_add_token($token);
 				$last = $self->_set_last( $token, $last )
-				  if ( $token ne ')' or uc( $self->_next_token ) ne 'AS' );
+				  if ( $token ne ')' or (defined $self->_next_token and uc( $self->_next_token ) ne 'AS') );
 				$self->{'_is_in_explain'} = 0;
 				next;
 			}

t/test-files/expected/ex77.sql

@@ -69,12 +69,5 @@ $$
 LANGUAGE plpgsql;
 
 SELECT
-    throws_ok ($$
-        SELECT
-            * FROM custom_function ('value1', 'value2');
-
-$$,
-'P0001',
-'NULL password for new user: app21_user',
-$e$ NULL PASSWORD FOR new user: app21_user $e$);
+    throws_ok ($$select * from custom_function('value1', 'value2');$$, 'P0001', 'NULL password for new user: app21_user', $e$ NULL PASSWORD FOR new user: app21_user $e$);