github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

No effective change - code cleanup - simplify if

Browse Source
This commit is contained in:
Robin Bygrave
2015-07-31 14:51:34 +12:00
parent 069b83b78d
commit 53cf6c162c
8 changed files with 17 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
+6 -17
View File
@@ -90,13 +90,11 @@ public class DRawSqlSelectBuilder {
debug("Parsing sql-select in " + getErrName());
}
if (hasPlaceHolders()) {
} else {
// parse the sql for the keywords...
// select, from, where, having, group by, order by
parseSqlFindKeywords(true);
}
if (!hasPlaceHolders()) {
// parse the sql for the keywords...
// select, from, where, having, group by, order by
parseSqlFindKeywords(true);
}
List<DRawSqlColumnInfo> selectColumns = findSelectColumns(meta.getColumnMapping());
whereExprPos = findWhereExprPosition();
@@ -140,16 +138,7 @@ public class DRawSqlSelectBuilder {
}
private boolean hasPlaceHolders() {
if (placeHolderWhere > -1) {
return true;
}
if (placeHolderAndWhere > -1) {
return true;
}
if (placeHolderHaving > -1) {
return true;
}
return placeHolderAndHaving > -1;
return placeHolderWhere > -1 || placeHolderAndWhere > -1 || placeHolderHaving > -1 || placeHolderAndHaving > -1;
}
/**