svn commit: r998056 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle: OracleAdapter.java OracleCharType.java

[ev...@apache.org]

Author: evgeny
Date: Fri Sep 17 10:30:09 2010
New Revision: 998056

URL: http://svn.apache.org/viewvc?rev=998056&view=rev
Log:
CAY-1470 Oracle: Problem with bind CHAR in select
add oracle specific CHAR handling

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleCharType.java
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java?rev=998056&r1=998055&r2=998056&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java Fri Sep 17 10:30:09 2010
@@ -36,7 +36,6 @@ import org.apache.cayenne.access.trans.Q
 import org.apache.cayenne.access.trans.QueryAssembler;
 import org.apache.cayenne.access.types.ByteArrayType;
 import org.apache.cayenne.access.types.ByteType;
-import org.apache.cayenne.access.types.CharType;
 import org.apache.cayenne.access.types.ExtendedType;
 import org.apache.cayenne.access.types.ExtendedTypeMap;
 import org.apache.cayenne.access.types.ShortType;
@@ -175,7 +174,7 @@ public class OracleAdapter extends JdbcA
         super.configureExtendedTypes(map);
 
         // create specially configured CharType handler
-        map.registerType(new CharType(true, true));
+        map.registerType(new OracleCharType());
 
         // create specially configured ByteArrayType handler
         map.registerType(new ByteArrayType(true, true));

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleCharType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleCharType.java?rev=998056&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleCharType.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleCharType.java Fri Sep 17 10:30:09 2010
@@ -0,0 +1,58 @@
+/*****************************************************************
+ *   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.cayenne.dba.oracle;
+
+import java.sql.PreparedStatement;
+import java.sql.Types;
+
+import org.apache.cayenne.access.types.CharType;
+
+/**
+ * Oracle specific CHAR type handling. 
+ * 
+ * If connection property "fixedString" is true, then
+ * 'a' equal 'a ' in a CHAR(4) while parameter binding in PreparedStatement.
+ * 
+ * @since 3.1
+ */
+public class OracleCharType extends CharType {
+
+    public OracleCharType() {
+        super(true, true);
+    }
+
+    @Override
+    public void setJdbcObject(
+            PreparedStatement st,
+            Object val,
+            int pos,
+            int type,
+            int precision) throws Exception {
+        if (type == Types.CLOB) {
+            st.setString(pos, (String) val);
+        }
+        else {
+            // use exactly this method to solve CAY-1470
+            // setting connection property "fixedString" to true doesn't help
+            // with .setString(parameterIndex, x)
+            // nether with .setObject(parameterIndex, x, targetSqlType)
+            st.setObject(pos, val);
+        }
+    }
+}