Browse Source

jfinal 3.4

James 8 years ago
parent
commit
dfff00c6f9

+ 5 - 1
src/main/java/com/jfinal/plugin/activerecord/builder/KeepByteAndShortModelBuilder.java

@@ -58,8 +58,12 @@ public class KeepByteAndShortModelBuilder extends ModelBuilder {
 					value = rs.getByte(i);
 					value = rs.getByte(i);
 				else if (types[i] == Types.SMALLINT)
 				else if (types[i] == Types.SMALLINT)
 					value = rs.getShort(i);
 					value = rs.getShort(i);
-				else if (types[i] < Types.BLOB)
+				else if (types[i] < Types.DATE)
 					value = rs.getObject(i);
 					value = rs.getObject(i);
+				else if (types[i] == Types.TIMESTAMP)
+					value = rs.getTimestamp(i);
+				else if (types[i] == Types.DATE)
+					value = rs.getDate(i);
 				else if (types[i] == Types.CLOB)
 				else if (types[i] == Types.CLOB)
 					value = handleClob(rs.getClob(i));
 					value = handleClob(rs.getClob(i));
 				else if (types[i] == Types.NCLOB)
 				else if (types[i] == Types.NCLOB)

+ 5 - 1
src/main/java/com/jfinal/plugin/activerecord/builder/KeepByteAndShortRecordBuilder.java

@@ -61,8 +61,12 @@ public class KeepByteAndShortRecordBuilder extends RecordBuilder {
 					value = rs.getByte(i);
 					value = rs.getByte(i);
 				else if (types[i] == Types.SMALLINT)
 				else if (types[i] == Types.SMALLINT)
 					value = rs.getShort(i);
 					value = rs.getShort(i);
-				else if (types[i] < Types.BLOB)
+				else if (types[i] < Types.DATE)
 					value = rs.getObject(i);
 					value = rs.getObject(i);
+				else if (types[i] == Types.TIMESTAMP)
+					value = rs.getTimestamp(i);
+				else if (types[i] == Types.DATE)
+					value = rs.getDate(i);
 				else if (types[i] == Types.CLOB)
 				else if (types[i] == Types.CLOB)
 					value = ModelBuilder.me.handleClob(rs.getClob(i));
 					value = ModelBuilder.me.handleClob(rs.getClob(i));
 				else if (types[i] == Types.NCLOB)
 				else if (types[i] == Types.NCLOB)