Author: cbegin
Date: Sat May 23 03:04:22 2009
New Revision: 777781
URL: http://svn.apache.org/viewvc?rev=777781&view=rev
Log:
Added placeholder for Java 6 NString types.
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NClobTypeHandler.java
(contents, props changed)
- copied, changed from r776072,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ClobTypeHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NStringTypeHandler.java
(contents, props changed)
- copied, changed from r776072,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/JdbcType.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/JdbcType.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/JdbcType.java?rev=777781&r1=777780&r2=777781&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/JdbcType.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/JdbcType.java
Sat May 23 03:04:22 2009
@@ -29,17 +29,10 @@
CLOB(Types.CLOB),
BOOLEAN(Types.BOOLEAN),
CURSOR(-10), // Oracle
- UNDEFINED(Integer.MIN_VALUE + 1000);
-
- // ----------------
- // -- Unsupported--
- // ----------------
- //JAVA_OBJECT(Types.JAVA_OBJECT),
- //DISTINCT(Types.DISTINCT),
- //STRUCT(Types.STRUCT),
- //ARRAY(Types.ARRAY),
- //REF(Types.REF),
- //DATALINK(Types.DATALINK),
+ UNDEFINED(Integer.MIN_VALUE + 1000),
+ NVARCHAR(-9),
+ NCHAR(-15),
+ NCLOB(2011);
public final int TYPE_CODE;
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NClobTypeHandler.java
(from r776072,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ClobTypeHandler.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NClobTypeHandler.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NClobTypeHandler.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ClobTypeHandler.java&r1=776072&r2=777781&rev=777781&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/ClobTypeHandler.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NClobTypeHandler.java
Sat May 23 03:04:22 2009
@@ -3,19 +3,21 @@
import java.io.StringReader;
import java.sql.*;
-public class ClobTypeHandler extends BaseTypeHandler {
+public class NClobTypeHandler extends BaseTypeHandler {
public void setNonNullParameter(PreparedStatement ps, int i, Object
parameter, JdbcType jdbcType)
throws SQLException {
String s = (String) parameter;
StringReader reader = new StringReader(s);
+// ps.setNCharacterStream(i, reader, s.length());
ps.setCharacterStream(i, reader, s.length());
}
public Object getNullableResult(ResultSet rs, String columnName)
throws SQLException {
String value = "";
+// Clob clob = rs.getNClob(columnName);
Clob clob = rs.getClob(columnName);
if (clob != null) {
int size = (int) clob.length();
@@ -27,6 +29,7 @@
public Object getNullableResult(CallableStatement cs, int columnIndex)
throws SQLException {
String value = "";
+// Clob clob = cs.getNClob(columnIndex);
Clob clob = cs.getClob(columnIndex);
if (clob != null) {
int size = (int) clob.length();
@@ -35,4 +38,4 @@
return value;
}
-}
+}
\ No newline at end of file
Propchange:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NClobTypeHandler.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NStringTypeHandler.java
(from r776072,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NStringTypeHandler.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NStringTypeHandler.java&p1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java&r1=776072&r2=777781&rev=777781&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/StringTypeHandler.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NStringTypeHandler.java
Sat May 23 03:04:22 2009
@@ -2,21 +2,24 @@
import java.sql.*;
-public class StringTypeHandler extends BaseTypeHandler {
+public class NStringTypeHandler extends BaseTypeHandler {
public void setNonNullParameter(PreparedStatement ps, int i, Object
parameter, JdbcType jdbcType)
throws SQLException {
+// ps.setNString(i, ((String) parameter));
ps.setString(i, ((String) parameter));
}
public Object getNullableResult(ResultSet rs, String columnName)
throws SQLException {
+// return rs.getNString(columnName);
return rs.getString(columnName);
}
public Object getNullableResult(CallableStatement cs, int columnIndex)
throws SQLException {
+// return cs.getNString(columnIndex);
return cs.getString(columnIndex);
}
-}
+}
\ No newline at end of file
Propchange:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/NStringTypeHandler.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java?rev=777781&r1=777780&r2=777781&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
Sat May 23 03:04:22 2009
@@ -43,8 +43,12 @@
register(double.class, new DoubleTypeHandler());
register(String.class, new StringTypeHandler());
+ register(String.class, JdbcType.CHAR, new StringTypeHandler());
register(String.class, JdbcType.CLOB, new ClobTypeHandler());
register(String.class, JdbcType.LONGVARCHAR, new ClobTypeHandler());
+ register(String.class, JdbcType.NVARCHAR, new NStringTypeHandler());
+ register(String.class, JdbcType.NCHAR, new NStringTypeHandler());
+ register(String.class, JdbcType.NCLOB, new NClobTypeHandler());
register(BigDecimal.class, new BigDecimalTypeHandler());
