Merge remote-tracking branch 'upstream/develop' into feature/version_check

Author: Samuel Nitsche

pom.xml

@@ -23,6 +23,12 @@
       <version>12.2.0.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.oracle.jdbc</groupId>
+      <artifactId>orai18n</artifactId>
+      <version>12.2.0.1</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

src/main/java/org/utplsql/api/DBHelper.java

@@ -12,7 +12,7 @@
  */
 public final class DBHelper {
 
-    public static final String UTPLSQL_COMPATIBILITY_VERSION = "3.0.3";
+    public static final String UTPLSQL_COMPATIBILITY_VERSION = "3";
 
     private DBHelper() {}
 
@@ -96,6 +96,24 @@ public static boolean versionCompatibilityCheck(Connection conn)
         return versionCompatibilityCheck(conn, UTPLSQL_COMPATIBILITY_VERSION);
     }
 
+
+    /** Checks if actual API-version is compatible with utPLSQL database version and throws a RuntimeException if not
+     * Throws a RuntimeException if version compatibility can not be checked.
+     *
+     * @param conn Active db connection
+     */
+    public static void failOnVersionCompatibilityCheckFailed( Connection conn )
+    {
+        try {
+            if (!versionCompatibilityCheck(conn))
+                throw new RuntimeException("API-Version " + UTPLSQL_COMPATIBILITY_VERSION + " not compatible with database. Aborting.");
+        }
+        catch ( SQLException e )
+        {
+            throw new RuntimeException("Compatibility-check failed with error. Aborting.", e);
+        }
+    }
+
     /**
      * Enable the dbms_output buffer with unlimited size.
      * @param conn the connection
@@ -119,21 +137,4 @@ public static void disableDBMSOutput(Connection conn) {
             System.out.println("Failed to disable dbms_output.");
         }
     }
-
-    /** Checks if actual API-version is compatible with utPLSQL database version and throws a RuntimeException if not
-     * Throws a RuntimeException if version compatibility can not be checked.
-     *
-     * @param conn
-     */
-    public static void failOnVersionCompatibilityCheckFailed( Connection conn )
-    {
-        try {
-            if (!versionCompatibilityCheck(conn))
-                throw new RuntimeException("API-Version " + UTPLSQL_VERSION + " not compatible with database. Aborting.");
-        }
-        catch ( SQLException e )
-        {
-            throw new RuntimeException("Compatibility-check failed with error. Aborting.", e);
-        }
-    }
 }

src/main/java/org/utplsql/api/exception/DatabaseNotCompatibleException.java

@@ -32,7 +32,7 @@ public DatabaseNotCompatibleException( String clientVersion, String databaseVers
 
     public DatabaseNotCompatibleException( String databaseVersion, Throwable cause )
     {
-        this(DBHelper.UTPLSQL_VERSION, databaseVersion, cause );
+        this(DBHelper.UTPLSQL_COMPATIBILITY_VERSION, databaseVersion, cause );
     }
 
     public String getClientVersion() {