Skip to content

Commit 08b9477

Browse files
authored
fixbuild (#978)
1 parent 79b5fe9 commit 08b9477

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ String RelObjectNameWithoutValue() :
11691169
| tk=<K_ZONE> | tk=<K_COLUMNS> | tk=<K_DESCRIBE> | tk=<K_FN> | tk=<K_PATH>
11701170
| tk=<K_DATE_LITERAL> | tk=<K_NEXTVAL> | tk=<K_TRUE> | tk=<K_FALSE> | tk=<K_DUPLICATE>
11711171
| tk=<K_READ> | tk=<K_SCHEMA> | tk=<K_SIZE> | tk=<K_SESSION>
1172-
| tk=<K_VIEW> | tk=<K_NOLOCK> | tk=<K_VALIDATE>
1172+
| tk=<K_VIEW> | tk=<K_NOLOCK> | tk=<K_VALIDATE> | tk=<K_CYCLE>
11731173
/* | tk=<K_PLACING> | tk=<K_BOTH> | tk=<K_LEADING> | tk=<K_TRAILING> */
11741174
)
11751175

@@ -3808,6 +3808,8 @@ CreateTable CreateTable():
38083808
<K_CREATE>
38093809
[ <K_UNLOGGED> { createTable.setUnlogged(true); } ]
38103810

3811+
// table options, not required but 1 or none
3812+
[ tk=<K_GLOBAL> { createOptions.add(tk.image);} ]
38113813
/* [ [ (tk=<K_GLOBAL> | tk=<K_LOCAL>) {createOptions.add(tk.image);} ]
38123814
( tk=<K_TEMPORARY> | tk=<K_TEMP> ) {createOptions.add(tk.image);}] */
38133815

src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.io.File;
1313
import java.io.IOException;
1414
import java.util.Arrays;
15+
import java.util.LinkedList;
1516
import java.util.List;
1617
import java.util.logging.Level;
1718
import java.util.logging.Logger;
@@ -21,6 +22,8 @@
2122
import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
2223
import org.apache.commons.io.FileUtils;
2324
import static org.junit.Assert.assertTrue;
25+
26+
import org.assertj.core.api.Assertions;
2427
import org.junit.ComparisonFailure;
2528
import org.junit.Test;
2629

@@ -245,6 +248,7 @@ public void testAllSqlsParseDeparse() throws IOException {
245248
public void testAllSqlsOnlyParse() throws IOException {
246249
File[] sqlTestFiles = new File(SQLS_DIR, "only-parse-test").listFiles();
247250

251+
List<String> regressionFiles = new LinkedList<>();
248252
for (File file : sqlTestFiles) {
249253
LOG.log(Level.INFO, "testing {0}", file.getName());
250254
String sql = FileUtils.readFileToString(file);
@@ -253,9 +257,12 @@ public void testAllSqlsOnlyParse() throws IOException {
253257

254258
LOG.info(" -> SUCCESS");
255259
} catch (JSQLParserException ex) {
260+
regressionFiles.add(file.getName());
256261
LOG.log(Level.SEVERE, null, ex);
257262
}
258263
}
264+
265+
Assertions.assertThat(regressionFiles).describedAs("All files should parse successfully, a regression was detected!").isEmpty();
259266
}
260267

261268
@Test

0 commit comments

Comments
 (0)