svn commit: r555361 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

[wisneskid]

Author: wisneskid
Date: Wed Jul 11 11:39:08 2007
New Revision: 555361

URL: http://svn.apache.org/viewvc?view=rev&rev=555361
Log:
Add product version checking for DB2 UDB ISeries V6R1

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?view=diff&rev=555361&r1=555360&r2=555361
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
 Wed Jul 11 11:39:08 2007
@@ -335,7 +335,7 @@
         boolean match = false;
         if ((databaseProductVersion.indexOf("SQL") != -1
             || databaseProductName.indexOf("DB2/") != -1)
-            && ((maj == 8 && min >= 2) ||(maj >= 8)))
+            && ((maj == 8 && min >= 2) || (maj >= 9)))
             match = true;
         return match;
     }
@@ -354,7 +354,7 @@
        throws SQLException {
        boolean match = false;
        if (databaseProductName.indexOf("AS") != -1
-           && maj == 5 && min <=3)
+           && ((maj == 5 && min <=3) || maj < 5))
            match = true;
        return match;
     }
@@ -363,7 +363,7 @@
        throws SQLException {
        boolean match = false;
        if (databaseProductName.indexOf("AS") != -1
-           && maj >= 5 && min >=4)
+           && (maj >=6 || (maj == 5 && min >=4)))
            match = true;
       return match;
     }
@@ -372,7 +372,7 @@
         boolean match = false;
         if ((databaseProductVersion.indexOf("SQL") != -1 
            || databaseProductName.indexOf("DB2/") != -1) &&
-           ((maj == 8 && min <= 1)|| maj < 8))
+           ((maj == 8 && min <= 1) || maj < 8))
             match = true;
         return match;
     }