Browse Source

Allow parens directly before and after FROM

dependabot/maven/junit-junit-4.13.1
Travis Burtrum 3 years ago
parent
commit
1e4a1c2371
  1. 2
      jdbcmapper/src/main/java/com/moparisthebest/jdbc/codegen/SimpleSQLParser.java
  2. 5
      test/src/test/java/com/moparisthebest/jdbc/codegen/SimpleSQLParserTest.java

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

@ -10,7 +10,7 @@ public class SimpleSQLParser extends AbstractSQLParser { @@ -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

@ -37,6 +37,11 @@ public class SimpleSQLParserTest { @@ -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

Loading…
Cancel
Save