write the sqlite3 function to only switch on VARBINARY/LONGVARBINARY …

…and otherwise call super.jdbcToRuby
charl · Sep 14, 2011 · eaea873 · eaea873
1 parent 61dab56
commit eaea873
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/lib/arjdbc/jdbc/adapter_java.jar b/lib/arjdbc/jdbc/adapter_java.jar
diff --git a/src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java b/src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java
@@ -82,21 +82,9 @@ protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet r
             case Types.LONGVARCHAR:
                 return runtime.is1_9() ?
                     readerToRuby(runtime, resultSet, resultSet.getCharacterStream(column)) :
-                    streamToRuby(runtime, resultSet, new ByteArrayInputStream(resultSet.getBytes(column)));
-            case Types.CLOB:
-                return readerToRuby(runtime, resultSet, resultSet.getCharacterStream(column));
-            case Types.TIMESTAMP:
-                return timestampToRuby(runtime, resultSet, resultSet.getTimestamp(column));
-            case Types.INTEGER:
-            case Types.SMALLINT:
-            case Types.TINYINT:
-                return integerToRuby(runtime, resultSet, resultSet.getLong(column));
-            case Types.REAL:
-                return doubleToRuby(runtime, resultSet, resultSet.getDouble(column));
-            case Types.BIGINT:
-                return bigIntegerToRuby(runtime, resultSet, resultSet.getString(column));
+                    streamToRuby(runtime, resultSet, new ByteArrayInputStream(resultSet.getBytes(column)));            
             default:
-                return stringToRuby(runtime, resultSet, resultSet.getString(column));
+                return super.jdbcToRuby(runtime, column, type, resultSet);
             }
         } catch (IOException ioe) {
             throw (SQLException) new SQLException(ioe.getMessage()).initCause(ioe);