Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14193 MultipleLinesSqlCommandExtractor should tolerate empty input scripts

This commit is contained in:
Sanne Grinovero 2020-08-26 22:19:44 +01:00
parent b9fcc63d84
commit 59d40c3bf5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/antlr/sql-script.g
View File

@ -57,7 +57,7 @@ options {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
script
: (newLineToSkip)* (statement)+ EOF
: (newLineToSkip)* (statement)* EOF
;
statement
@ -141,7 +141,7 @@ LINE_COMMENT
;
/**
* Note : this comes from the great Terrance Parr (author of Antlr) -
* Note : this comes from the great Terence Parr (author of Antlr) -
*
* https://theantlrguy.atlassian.net/wiki/spaces/ANTLR3/pages/2687360/How+do+I+match+multi-line+comments
*/

10
hibernate-core/src/test/java/org/hibernate/test/fileimport/MultiLineImportExtractorTest.java
View File

@ -9,6 +9,7 @@ package org.hibernate.test.fileimport;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
import org.hibernate.tool.hbm2ddl.MultipleLinesSqlCommandExtractor;
@ -58,4 +59,13 @@ public class MultiLineImportExtractorTest {
}
}
}
@Test
public void testExtractionFromEmptyScript() throws IOException {
StringReader reader = new StringReader( "" );
final String[] commands = extractor.extractCommands( reader );
assertThat( commands, notNullValue() );
assertThat( commands.length, is( 0 ) );
}
}