Author: reschke
Date: Wed Feb 15 14:59:32 2017
New Revision: 1783110
URL: http://svn.apache.org/viewvc?rev=1783110&view=rev
Log:
OAK-5667: RDBDocumentStore: remove unneeded support for DBs without support for
CASE statements in SELECT
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1783110&r1=1783109&r2=1783110&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
Wed Feb 15 14:59:32 2017
@@ -67,11 +67,6 @@ public enum RDBDocumentStoreDB {
public String checkVersion(DatabaseMetaData md) throws SQLException {
return RDBJDBCTools.versionCheck(md, 10, 11, description);
}
-
- @Override
- public boolean allowsCaseInSelect() {
- return false;
- }
},
POSTGRES("PostgreSQL") {
@@ -429,13 +424,6 @@ public enum RDBDocumentStoreDB {
}
/**
- * Allows case in select. Default true.
- */
- public boolean allowsCaseInSelect() {
- return true;
- }
-
- /**
* Query syntax for "FETCH FIRST"
*/
public FETCHFIRSTSYNTAX getFetchFirstSyntax() {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1783110&r1=1783109&r2=1783110&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Wed Feb 15 14:59:32 2017
@@ -616,7 +616,7 @@ public class RDBDocumentStoreJDBC {
@CheckForNull
public RDBRow read(Connection connection, RDBTableMetaData tmd, String id,
long lastmodcount, long lastmodified) throws SQLException {
- boolean useCaseStatement = lastmodcount != -1 && lastmodified >= 1 &&
this.dbInfo.allowsCaseInSelect();
+ boolean useCaseStatement = lastmodcount != -1 && lastmodified >= 1;
StringBuffer sql = new StringBuffer();
sql.append("select MODIFIED, MODCOUNT, CMODCOUNT, HASBINARY,
DELETEDONCE, ");
if (useCaseStatement) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java?rev=1783110&r1=1783109&r2=1783110&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBCTest.java
Wed Feb 15 14:59:32 2017
@@ -68,9 +68,6 @@ public class RDBDocumentStoreJDBCTest ex
@Test
public void conditionalRead() throws SQLException {
- // this tests functionality that relies on case statements
- assumeTrue(dbInfo.allowsCaseInSelect());
-
String id = this.getClass().getName() + ".conditionalRead";
super.ds.remove(Collection.NODES, id);
UpdateOp op = new UpdateOp(id, true);
