github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-22 22:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1688 from thibaultmeyer/bugfix/useless-comparison-test

Browse Source 
Remove useless comparison test
This commit is contained in:
Rob Bygrave
2019-04-29 09:18:11 +12:00
committed by GitHub
parent 4bedefa494 c5d761076a
commit 112de29964
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java
+2 -6
View File
@@ -65,13 +65,9 @@ public class SqlServer2005SqlLimiter implements SqlLimiter {
sb.append(NEW_LINE).append(") ");
sb.append(rowNumberWindowAlias);
sb.append(" where ");
if (firstRow > 0) {
sb.append(" rn > ").append(firstRow);
if (lastRow > 0) {
sb.append(" and ");
}
}
sb.append(" rn > ").append(firstRow);
if (lastRow > 0) {
sb.append(" and ");
sb.append(" rn <= ").append(lastRow);
}
src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java
+2 -4
View File
@@ -38,10 +38,8 @@ public class SqlServerSqlLimiter implements SqlLimiter {
}
sb.append(dbSql);
if (firstRow > 0) {
sb.append(" ").append("offset");
sb.append(" ").append(firstRow).append(" rows");
}
sb.append(" ").append("offset");
sb.append(" ").append(firstRow).append(" rows");
if (maxRows > 0) {
sb.append(" fetch next ").append(maxRows).append(" rows only");
}
src/main/java/io/ebeaninternal/server/query/CQueryPlanRawSql.java
+2 -4
View File
@@ -48,10 +48,8 @@ class CQueryPlanRawSql extends CQueryPlan {
// an associated bean is in the raw SQL but is mapped columnIgnore
for (int i = 0; i < indexPositions.length; i++) {
if (indexPositions[i] == 0) {
if (i < indexPositions.length) {
// expect discriminator column to immediately proceed id column
indexPositions[i] = indexPositions[i + 1] - 1;
}
// expect discriminator column to immediately proceed id column
indexPositions[i] = indexPositions[i + 1] - 1;
}
}