moparisthebest/JdbcMapper
1
0
Fork 0
mirror of https://github.com/moparisthebest/JdbcMapper synced 2024-11-13 12:45:02 -05:00
Code Issues Releases Wiki Activity

Allow parens directly before and after FROM

Browse Source
This commit is contained in:
Travis Burtrum 2020-03-31 23:50:48 -04:00
parent 3a51d6ee56
commit 1e4a1c2371
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdbcmapper/src/main/java/com/moparisthebest/jdbc/codegen/SimpleSQLParser.java
View File

@ -10,7 +10,7 @@ public class SimpleSQLParser extends AbstractSQLParser {
private static final Pattern aliasPattern = Pattern.compile("^.*\\.");
private static final Pattern parenPattern = Pattern.compile("\\([^)]+\\)");
private static final Pattern fromPattern = Pattern.compile("\\s+FROM\\s+");
private static final Pattern fromPattern = Pattern.compile("[\\s)]+FROM[\\s(]+");
public SimpleSQLParser() {
super(null, false);

5
test/src/test/java/com/moparisthebest/jdbc/codegen/SimpleSQLParserTest.java
View File

@ -37,6 +37,11 @@ public class SimpleSQLParserTest {
assertTrue(ret.isSelect());
assertArrayEquals(new String[]{null, "SOMETHING_FROM_BOB"}, ret.columnNames());
}
{
final SQLParser ret = getFactory().parse("select something_from_bob from( tom)");
assertTrue(ret.isSelect());
assertArrayEquals(new String[]{null, "SOMETHING_FROM_BOB"}, ret.columnNames());
}
}
@Test