Introduced DatabaseNotComptabileException

Also added some tests for getting Framework version and fixed error in getting it

Author: Samuel Nitsche

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

@@ -1,6 +1,7 @@
 package org.utplsql.api;
 
 import oracle.jdbc.OracleTypes;
+import org.utplsql.api.exception.DatabaseNotCompatibleException;
 
 import java.sql.*;
 
@@ -94,20 +95,25 @@ public static boolean versionCompatibilityCheck(Connection conn)
     }
 
 
-    /** 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.
+    /** Checks if actual API-version is compatible with utPLSQL database version and throws a DatabaseNotCompatibleException if not
+     * Throws a DatabaseNotCompatibleException if version compatibility can not be checked.
      *
      * @param conn Active db connection
      */
-    public static void failOnVersionCompatibilityCheckFailed( Connection conn )
+    public static void failOnVersionCompatibilityCheckFailed( Connection conn ) throws DatabaseNotCompatibleException
     {
         try {
             if (!versionCompatibilityCheck(conn))
-                throw new RuntimeException("API-Version " + UTPLSQL_COMPATIBILITY_VERSION + " not compatible with database. Aborting.");
+            {
+                // Try to find out Framework Version
+                Version v = DBHelper.getDatabaseFrameworkVersion(conn);
+
+                throw new DatabaseNotCompatibleException( v.getVersionString() );
+            }
         }
         catch ( SQLException e )
         {
-            throw new RuntimeException("Compatibility-check failed with error. Aborting.", e);
+            throw new DatabaseNotCompatibleException("Compatibility-check failed with error. Aborting.", UTPLSQL_COMPATIBILITY_VERSION, "Unknown", e);
         }
     }
 
@@ -120,9 +126,9 @@ public static void failOnVersionCompatibilityCheckFailed( Connection conn )
     public static Version getDatabaseFrameworkVersion( Connection conn )
             throws SQLException {
         Version result = new Version("");
-        try (Statement stmt = conn.prepareStatement("select ut_runner.version() from dual"))
+        try (PreparedStatement stmt = conn.prepareStatement("select ut_runner.version() from dual"))
         {
-            ResultSet rs = stmt.getResultSet();
+            ResultSet rs = stmt.executeQuery();
 
             if ( rs.next() )
                 result = new Version(rs.getString(1));

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

@@ -1,5 +1,6 @@
 package org.utplsql.api;
 
+import org.utplsql.api.exception.DatabaseNotCompatibleException;
 import org.utplsql.api.exception.SomeTestsFailedException;
 import org.utplsql.api.reporter.DocumentationReporter;
 import org.utplsql.api.reporter.Reporter;
@@ -84,7 +85,7 @@ public TestRunner failOnErrors(boolean failOnErrors) {
         return this;
     }
 
-    public void run(Connection conn) throws SomeTestsFailedException, SQLException {
+    public void run(Connection conn) throws SomeTestsFailedException, SQLException, DatabaseNotCompatibleException {
 
         // First of all check version compatibility
         DBHelper.failOnVersionCompatibilityCheckFailed(conn);

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

@@ -2,12 +2,14 @@
 
 import org.utplsql.api.DBHelper;
 
+import java.sql.SQLException;
+
 /** Custom exception to indicate API is not compatible with database framework
  *
  * @author pesse
  *
  */
-public class DatabaseNotCompatibleException extends Exception {
+public class DatabaseNotCompatibleException extends SQLException {
 
     private String clientVersion;
     private String databaseVersion;
@@ -35,6 +37,11 @@ public DatabaseNotCompatibleException( String databaseVersion, Throwable cause )
         this(DBHelper.UTPLSQL_COMPATIBILITY_VERSION, databaseVersion, cause );
     }
 
+    public DatabaseNotCompatibleException( String databaseVersion )
+    {
+        this(DBHelper.UTPLSQL_COMPATIBILITY_VERSION, databaseVersion, null );
+    }
+
     public String getClientVersion() {
         return clientVersion;
     }

src/test/java/org/utplsql/api/DBHelperTest.java

@@ -34,4 +34,17 @@ public void incompatibleVersion() {
         }
     }
 
+    @Test
+    public void getFrameworkVersion()
+    {
+        try {
+            Version v = DBHelper.getDatabaseFrameworkVersion(db.newConnection());
+            Assert.assertEquals(true, v.isValid());
+        } catch (SQLException e)
+        {
+            e.printStackTrace();
+            Assert.fail();
+        }
+    }
+
 }