moparisthebest/JdbcMapper
1
0
Fork 0
mirror of https://github.com/moparisthebest/JdbcMapper synced 2024-12-22 07:18:51 -05:00
Code Issues Releases Wiki Activity

Fix case of functions in select statement in SimpleSQLParser

Browse Source
This commit is contained in:
Travis Burtrum 2017-06-19 23:50:59 -04:00
parent 68c1c0482e
commit f66c8429fb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import java.util.regex.Pattern;
public class SimpleSQLParser extends AbstractSQLParser { public class SimpleSQLParser extends AbstractSQLParser {
private static final Pattern aliasPattern = Pattern.compile("^.*\\."); private static final Pattern aliasPattern = Pattern.compile("^.*\\.");
private static final Pattern parenPattern = Pattern.compile("\\([^)]+\\)");
public SimpleSQLParser() { public SimpleSQLParser() {
super(null, false); super(null, false);
@ -24,7 +25,7 @@ public class SimpleSQLParser extends AbstractSQLParser {
final boolean isSelect = sql.startsWith("SELECT"); final boolean isSelect = sql.startsWith("SELECT");
String[] columnNames = null; String[] columnNames = null;
if (isSelect) { if (isSelect) {
final String columns = sql.substring(sql.indexOf("SELECT") + 6, sql.indexOf("FROM")).trim(); final String columns = parenPattern.matcher(sql.substring(sql.indexOf("SELECT") + 6, sql.indexOf("FROM"))).replaceAll("").trim();
final String[] splitColumns = columns.split(","); final String[] splitColumns = columns.split(",");
columnNames = new String[splitColumns.length + 1]; columnNames = new String[splitColumns.length + 1];
int index = 0; int index = 0;

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

@ -29,6 +29,7 @@ public class SimpleSQLParserTest {
"select bob, tom from tom" "select bob, tom from tom"
, "select some_bob bob, some_tom as tom from tom" , "select some_bob bob, some_tom as tom from tom"
, "select tom.bob, some_tom as tom from tom" , "select tom.bob, some_tom as tom from tom"
, "select tom.bob, COALESCE(some_tom, 'UNKNOWN') as tom from tom"
}) { }) {
final SQLParser ret = getFactory().parse(sql); final SQLParser ret = getFactory().parse(sql);
assertTrue(ret.isSelect()); assertTrue(ret.isSelect());