db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1203754 - in /db/derby/code/trunk/java: client/org/apache/derby/client/net/ engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/
Date Fri, 18 Nov 2011 17:19:38 GMT
Author: rhillegas
Date: Fri Nov 18 17:19:38 2011
New Revision: 1203754

URL: http://svn.apache.org/viewvc?rev=1203754&view=rev
Log:
DERBY-5488: Change jdbc level to 4.1 when running on Java 6 or 7.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java?rev=1203754&r1=1203753&r2=1203754&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
Fri Nov 18 17:19:38 2011
@@ -51,7 +51,7 @@ public class NetDatabaseMetaData40 exten
      */
     public int getJDBCMinorVersion() throws SQLException {
         checkForClosedConnection();
-        return 0;
+        return 1;
     }
 
     /**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java?rev=1203754&r1=1203753&r2=1203754&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java
Fri Nov 18 17:19:38 2011
@@ -46,7 +46,7 @@ public class EmbedDatabaseMetaData40 ext
      * @return JDBC version minor number
      */
     public int getJDBCMinorVersion() {
-        return 0;
+        return 1;
     }
 
     public RowIdLifetime getRowIdLifetime() throws SQLException {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1203754&r1=1203753&r2=1203754&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Fri Nov 18 17:19:38 2011
@@ -668,13 +668,16 @@ public class DatabaseMetaDataTest extend
         int jdbcMinor = dmd.getJDBCMinorVersion();
         
         int expectedJDBCMajor = -1;
+        int expectedJDBCMinor = -1;
         if (JDBC.vmSupportsJDBC4())
         {
             expectedJDBCMajor = 4;
+            expectedJDBCMinor = 1;
         }
         else if (JDBC.vmSupportsJDBC3())
         {
             expectedJDBCMajor = 3;
+            expectedJDBCMajor = 0;
         }
         else if (JDBC.vmSupportsJSR169())
         {
@@ -686,7 +689,7 @@ public class DatabaseMetaDataTest extend
         {
             assertEquals("JDBC Major version",
                     expectedJDBCMajor, jdbcMajor);
-            assertEquals("JDBC Minor version", 0, jdbcMinor);
+            assertEquals("JDBC Minor version", expectedJDBCMinor, jdbcMinor);
         }
     }
     



Mime
View raw message