db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1188608 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/ java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/
Date Tue, 25 Oct 2011 11:19:40 GMT
Author: kahatlen
Date: Tue Oct 25 11:19:40 2011
New Revision: 1188608

URL: http://svn.apache.org/viewvc?rev=1188608&view=rev
Log:
DERBY-5449: 10.8 client with 10.5 server gives ClassCastException

Merged fix from trunk, revision 1186020.

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetStatementRequest.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 11:19:40 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,
 1181756,1183463,1183503,1183671,1186691
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,
 1181756,1183463,1183503,1183671,1186020,1186691

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 11:19:40 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7/java/client/org/apache/derby/client/net/NetCursor.java:1061570,1061578,1082235
-/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
 180790,1180858,1181756,1183463,1183671,1186691
+/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
 180790,1180858,1181756,1183463,1183671,1186020,1186691

Modified: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetStatementRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetStatementRequest.java?rev=1188608&r1=1188607&r2=1188608&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetStatementRequest.java
(original)
+++ db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetStatementRequest.java
Tue Oct 25 11:19:40 2011
@@ -1230,8 +1230,15 @@ public class NetStatementRequest extends
                     }
                     else
                     {
+                        // If the server doesn't support BOOLEAN parameters,
+                        // send the parameter as a SMALLINT instead.
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NSMALL;
                         lidAndLengths[i][1] = 2;
+                        if (inputRow[i] instanceof Boolean) {
+                            Boolean bool = (Boolean) inputRow[i];
+                            inputRow[i] = new Short(
+                                    bool.booleanValue() ? (short) 1 : 0);
+                        }
                     }
                     break;
                 case java.sql.Types.SMALLINT:

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java?rev=1188608&r1=1188607&r2=1188608&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/JDBCDriverTest.java
Tue Oct 25 11:19:40 2011
@@ -32,6 +32,8 @@ import java.io.*;
 import java.math.*;
 import java.sql.*;
 import java.util.*;
+import java.util.regex.Pattern;
+import org.apache.derbyTesting.junit.JDBC;
 
 public	class	JDBCDriverTest	extends	CompatibilitySuite
 {
@@ -255,6 +257,7 @@ public	class	JDBCDriverTest	extends	Comp
         derby_2602_test( conn );
         derby_4613_test( conn );
         derby_4888_test( conn );
+        derby_5449_test( conn );
 
 		close( conn );
 	}
@@ -382,7 +385,39 @@ public	class	JDBCDriverTest	extends	Comp
         // Used to get a ClassCastException here in some combinations.
         assertFalse(conn.getMetaData().storesLowerCaseIdentifiers());
     }
-    
+
+    /**
+     * A pattern that matches the value returned by
+     * DatabaseMetaData.getDriverVersion() for the versions that suffer
+     * from DERBY-5449. That is, all version on the 10.8 branch up to 10.8.2.2.
+     */
+    private static Pattern DERBY_5449_PATTERN = Pattern.compile(
+            "^10\\.8\\.([01]\\.|2\\.[012] ).*");
+
+    /**
+     * Test case for DERBY-5449. Verify that PreparedStatement.setBoolean()
+     * works across different versions. Used to fail with a ClassCastException
+     * when talking to servers at version 10.7 and earlier.
+     */
+    private void derby_5449_test(Connection conn) throws SQLException {
+        if (usingDerbyClient() &&
+                getServerVersion().compareTo(DRB_10_7) <= 0) {
+            // Derby's client drivers on the 10.8 branch up to 10.8.2.2
+            // suffered from DERBY-5449 and the test case will fail when
+            // talking to older servers. Skip the test case in such cases.
+            String driverVersion = conn.getMetaData().getDriverVersion();
+            if (DERBY_5449_PATTERN.matcher(driverVersion).matches()) {
+                return;
+            }
+        }
+
+        PreparedStatement ps = prepare(conn, "VALUES CAST(? AS INTEGER)");
+        ps.setBoolean(1, true);
+        JDBC.assertSingleValueResultSet(ps.executeQuery(), "1");
+        ps.setBoolean(1, false);
+        JDBC.assertSingleValueResultSet(ps.executeQuery(), "0");
+    }
+
 	/////////////////////////////////////////////////////////////
     //
 	//	TEST UDTs



Mime
View raw message