From c9414c4a6d0fbfa5c6668f2efdae54ec5bd6c2a7 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Tue, 29 Nov 2011 16:49:02 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3611 - Revert the
 Oracle jdbc adapter to a variant of the default jdbc adapter in place of the
 one supporting blobs. added oracleBlobJDBCAdapter for backward compatibility
 and latest oracle adapter extends the default adapter so it no longer
 manipulates blobs directly, works fine with the latest ojdbc6 driver

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1207963 13f79535-47bb-0310-9956-ffa450edef68
---
 .../jdbc/adapter/OracleBlobJDBCAdapter.java   | 72 +++++++++++++++++++
 .../store/jdbc/adapter/OracleJDBCAdapter.java | 29 +-------
 2 files changed, 73 insertions(+), 28 deletions(-)
 create mode 100644 activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleBlobJDBCAdapter.java

diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleBlobJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleBlobJDBCAdapter.java
new file mode 100644
index 0000000000..fbd484df76
--- /dev/null
+++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleBlobJDBCAdapter.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.store.jdbc.adapter;
+
+import java.sql.Blob;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import org.apache.activemq.store.jdbc.Statements;
+
+/**
+ * Implements all the default JDBC operations that are used
+ * by the JDBCPersistenceAdapter.
+ * <p/>
+ * Subclassing is encouraged to override the default
+ * implementation of methods to account for differences
+ * in JDBC Driver implementations.
+ * <p/>
+ * The JDBCAdapter inserts and extracts BLOB data using the
+ * getBytes()/setBytes() operations.
+ * <p/>
+ * The databases/JDBC drivers that use this adapter are:
+ * <ul>
+ * <li></li>
+ * </ul>
+ *
+ * @org.apache.xbean.XBean element="oracleBlobJDBCAdapter"
+ *
+ * 
+ */
+public class OracleBlobJDBCAdapter extends BlobJDBCAdapter {
+
+    @Override
+    public void setStatements(Statements statements) {
+        statements.setLongDataType("NUMBER");
+        statements.setSequenceDataType("NUMBER");
+
+        String addMessageStatement = "INSERT INTO "
+            + statements.getFullMessageTableName()
+            + "(ID, MSGID_PROD, MSGID_SEQ, CONTAINER, EXPIRATION, PRIORITY, MSG) VALUES (?, ?, ?, ?, ?, ?, empty_blob())";
+        statements.setAddMessageStatement(addMessageStatement);
+
+        String findMessageByIdStatement = "SELECT MSG FROM " +
+        	statements.getFullMessageTableName() + " WHERE ID=? FOR UPDATE";
+        statements.setFindMessageByIdStatement(findMessageByIdStatement);
+
+        super.setStatements(statements);
+    }
+
+    @Override
+    protected byte[] getBinaryData(ResultSet rs, int index) throws SQLException {
+        // Get as a BLOB
+        Blob aBlob = rs.getBlob(index);
+        if (aBlob == null) {
+            return null;
+        }
+        return aBlob.getBytes(1, (int) aBlob.length());
+    }
+}
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
index fba3b89202..7b90ee6367 100755
--- a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
@@ -30,44 +30,17 @@ import org.apache.activemq.store.jdbc.Statements;
  * implementation of methods to account for differences
  * in JDBC Driver implementations.
  * <p/>
- * The JDBCAdapter inserts and extracts BLOB data using the
- * getBytes()/setBytes() operations.
- * <p/>
- * The databases/JDBC drivers that use this adapter are:
- * <ul>
- * <li></li>
- * </ul>
  *
  * @org.apache.xbean.XBean element="oracleJDBCAdapter"
  *
  * 
  */
-public class OracleJDBCAdapter extends BlobJDBCAdapter {
+public class OracleJDBCAdapter extends DefaultJDBCAdapter {
 
     @Override
     public void setStatements(Statements statements) {
         statements.setLongDataType("NUMBER");
         statements.setSequenceDataType("NUMBER");
-
-        String addMessageStatement = "INSERT INTO "
-            + statements.getFullMessageTableName()
-            + "(ID, MSGID_PROD, MSGID_SEQ, CONTAINER, EXPIRATION, PRIORITY, MSG) VALUES (?, ?, ?, ?, ?, ?, empty_blob())";
-        statements.setAddMessageStatement(addMessageStatement);
-
-        String findMessageByIdStatement = "SELECT MSG FROM " +
-        	statements.getFullMessageTableName() + " WHERE ID=? FOR UPDATE";
-        statements.setFindMessageByIdStatement(findMessageByIdStatement);
-
         super.setStatements(statements);
     }
-
-    @Override
-    protected byte[] getBinaryData(ResultSet rs, int index) throws SQLException {
-        // Get as a BLOB
-        Blob aBlob = rs.getBlob(index);
-        if (aBlob == null) {
-            return null;
-        }
-        return aBlob.getBytes(1, (int) aBlob.length());
-    }
 }