fix(jdbc): throw SQLFeatureNotSupportedException instead of SQLException for unsupported features

Author: gotson

src/main/java/org/sqlite/jdbc3/JDBC3Connection.java

@@ -4,6 +4,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLWarning;
 import java.sql.Savepoint;
 import java.sql.Statement;
@@ -211,9 +212,7 @@ public void rollback(Savepoint savepoint) throws SQLException {
                         getAutoCommit());
     }
 
-    // UNUSED FUNCTIONS /////////////////////////////////////////////
-
     public Struct createStruct(String t, Object[] attr) throws SQLException {
-        throw new SQLException("unsupported by SQLite");
+        throw new SQLFeatureNotSupportedException("not implemented by SQLite JDBC driver");
     }
 }

src/main/java/org/sqlite/jdbc3/JDBC3PreparedStatement.java

@@ -15,6 +15,7 @@
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -185,10 +186,7 @@ public void setBigDecimal(int pos, BigDecimal value) throws SQLException {
      */
     private byte[] readBytes(InputStream istream, int length) throws SQLException {
         if (length < 0) {
-            SQLException exception =
-                    new SQLException("Error reading stream. Length should be non-negative");
-
-            throw exception;
+            throw new SQLException("Error reading stream. Length should be non-negative");
         }
 
         byte[] bytes = new byte[length];
@@ -404,55 +402,97 @@ public ResultSetMetaData getMetaData() throws SQLException {
         return (ResultSetMetaData) rs;
     }
 
-    // UNUSED ///////////////////////////////////////////////////////
-    protected SQLException unused() {
-        return new SQLException("not implemented by SQLite JDBC driver");
+    protected SQLException unsupported() {
+        return new SQLFeatureNotSupportedException("not implemented by SQLite JDBC driver");
+    }
+
+    protected SQLException invalid() {
+        return new SQLException("method cannot be called on a PreparedStatement");
     }
 
     // PreparedStatement ////////////////////////////////////////////
 
     public void setArray(int i, Array x) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
-    //    public void setBigDecimal(int parameterIndex, BigDecimal x)
-    //        throws SQLException { throw unused(); }
+
     public void setBlob(int i, Blob x) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     public void setClob(int i, Clob x) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     public void setRef(int i, Ref x) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     public void setURL(int pos, URL x) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     /** @see org.sqlite.core.CoreStatement#exec(java.lang.String) */
     @Override
     public boolean execute(String sql) throws SQLException {
-        throw unused();
+        throw invalid();
+    }
+
+    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
+        throw invalid();
+    }
+
+    public boolean execute(String sql, int[] colinds) throws SQLException {
+        throw invalid();
+    }
+
+    public boolean execute(String sql, String[] colnames) throws SQLException {
+        throw invalid();
     }
 
     /** @see org.sqlite.core.CoreStatement#exec(java.lang.String) */
     @Override
     public int executeUpdate(String sql) throws SQLException {
-        throw unused();
+        throw invalid();
+    }
+
+    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+        throw invalid();
+    }
+
+    public int executeUpdate(String sql, int[] colinds) throws SQLException {
+        throw invalid();
+    }
+
+    public int executeUpdate(String sql, String[] cols) throws SQLException {
+        throw invalid();
+    }
+
+    public long executeLargeUpdate(String sql) throws SQLException {
+        throw invalid();
+    }
+
+    public long executeLargeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+        throw invalid();
+    }
+
+    public long executeLargeUpdate(String sql, int[] colinds) throws SQLException {
+        throw invalid();
+    }
+
+    public long executeLargeUpdate(String sql, String[] cols) throws SQLException {
+        throw invalid();
     }
 
     /** @see org.sqlite.core.CoreStatement#exec(String) */
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
-        throw unused();
+        throw invalid();
     }
 
     /** */
     @Override
     public void addBatch(String sql) throws SQLException {
-        throw unused();
+        throw invalid();
     }
 }

src/main/java/org/sqlite/jdbc3/JDBC3Statement.java

@@ -4,6 +4,7 @@
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLWarning;
 import java.util.Arrays;
 import org.sqlite.ExtendedCommand;
@@ -74,7 +75,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
 
     static class BackupObserver implements ProgressObserver {
         public void progress(int remaining, int pageCount) {
-            System.out.println(String.format("remaining:%d, page count:%d", remaining, pageCount));
+            System.out.printf("remaining:%d, page count:%d%n", remaining, pageCount);
         }
     }
 
@@ -364,29 +365,37 @@ public int getResultSetType() throws SQLException {
     /** @see java.sql.Statement#setEscapeProcessing(boolean) */
     public void setEscapeProcessing(boolean enable) throws SQLException {
         if (enable) {
-            throw unused();
+            throw unsupported();
         }
     }
 
-    protected SQLException unused() {
-        return new SQLException("not implemented by SQLite JDBC driver");
+    protected SQLException unsupported() {
+        return new SQLFeatureNotSupportedException("not implemented by SQLite JDBC driver");
     }
 
     // Statement ////////////////////////////////////////////////////
 
     public boolean execute(String sql, int[] colinds) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     public boolean execute(String sql, String[] colnames) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     public int executeUpdate(String sql, int[] colinds) throws SQLException {
-        throw unused();
+        throw unsupported();
     }
 
     public int executeUpdate(String sql, String[] cols) throws SQLException {
-        throw unused();
+        throw unsupported();
+    }
+
+    public long executeLargeUpdate(String sql, int[] colinds) throws SQLException {
+        throw unsupported();
+    }
+
+    public long executeLargeUpdate(String sql, String[] cols) throws SQLException {
+        throw unsupported();
     }
 }