Skip to content

Commit f4073da

Browse files
committed
strip out newlines from DDL before formatting it
to avoid double newlines
1 parent 1390eca commit f4073da

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ else if ( lowerCaseSql.startsWith( "comment on" ) ) {
5858

5959
private String formatCommentOn(String sql) {
6060
final StringBuilder result = new StringBuilder( 60 ).append( INITIAL_LINE );
61-
final StringTokenizer tokens = new StringTokenizer( sql, " '[]\"", true );
61+
final StringTokenizer tokens =
62+
new StringTokenizer( sql.replace('\n',' '),
63+
" '[]\"", true );
6264

6365
boolean quoted = false;
6466
while ( tokens.hasMoreTokens() ) {
@@ -79,7 +81,9 @@ else if ( !quoted ) {
7981

8082
private String formatAlterTable(String sql) {
8183
final StringBuilder result = new StringBuilder( 60 ).append( INITIAL_LINE );
82-
final StringTokenizer tokens = new StringTokenizer( sql, " (,)'[]\"", true );
84+
final StringTokenizer tokens =
85+
new StringTokenizer( sql.replace('\n',' '),
86+
" (,)'[]\"", true );
8387

8488
boolean first = true;
8589
boolean quoted = false;
@@ -102,7 +106,9 @@ else if ( !quoted ) {
102106

103107
private String formatCreateTable(String sql) {
104108
final StringBuilder result = new StringBuilder( 60 ).append( INITIAL_LINE );
105-
final StringTokenizer tokens = new StringTokenizer( sql, "(,)'[]\"", true );
109+
final StringTokenizer tokens =
110+
new StringTokenizer( sql.replace('\n',' '),
111+
"(,)'[]\"", true );
106112

107113
int depth = 0;
108114
boolean quoted = false;

0 commit comments

Comments
 (0)