activerecord-jdbc-adapter 51.8-java → 52.0-java

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '51.8'
+  VERSION = '52.0'
 end

data/rakelib/01-tomcat.rake

@@ -1,6 +1,6 @@
 namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
 
-  TOMCAT_MAVEN_REPO = 'https://repo1.maven.org/maven2/org/apache/tomcat'
+  TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
   TOMCAT_VERSION = '7.0.54'
 
   DOWNLOAD_DIR = File.expand_path('../test/jars', File.dirname(__FILE__))
@@ -48,4 +48,4 @@ namespace :'tomcat-jndi' do # contains a FS JNDI impl (for tests)
     rm jar_path if File.exist?(jar_path)
   end
 
-end
+end

data/rakelib/02-test.rake

@@ -58,6 +58,7 @@ end
 test_task_for :Derby, :desc => 'Run tests against (embedded) DerbyDB'
 test_task_for :H2, :desc => 'Run tests against H2 database engine'
 test_task_for :HSQLDB, :desc => 'Run tests against HyperSQL (Java) database'
+test_task_for :MSSQL, :driver => :jtds, :database_name => 'MS-SQL (SQLServer)'
 test_task_for :MySQL #, :prereqs => 'db:mysql'
 task :test_mysql2 => :test_mysql
 test_task_for :PostgreSQL, :driver => ENV['JDBC_POSTGRES_VERSION'] || 'postgres' #, :prereqs => 'db:postgresql'
@@ -75,6 +76,8 @@ end
   test_task_for adapter, :desc => "Run tests against #{adapter} (ensure driver is on class-path)"
 end
 
+#test_task_for :MSSQL, :name => 'test_sqlserver', :driver => nil, :database_name => 'MS-SQL using SQLJDBC'
+
 test_task_for :AS400, :desc => "Run tests against AS400 (DB2) (ensure driver is on class-path)",
               :files => FileList["test/db2*_test.rb"] + FileList["test/db/db2/*_test.rb"]
 

data/rakelib/compile.rake

@@ -0,0 +1,70 @@
+jar_file = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
+begin
+  require 'ant'
+  directory classes = "pkg/classes"
+  CLEAN << classes
+
+  driver_jars = []
+  # PostgreSQL driver :
+  driver_jars << Dir.glob("jdbc-postgres/lib/*.jar").sort.last
+  
+  file jar_file => FileList['src/java/**/*.java', 'pkg/classes'] do
+    rm_rf FileList["#{classes}/**/*"]
+    ant.javac :srcdir => "src/java", :destdir => "pkg/classes",
+      :source => "7", :target => "7", :debug => true, :deprecation => true,
+      :classpath => "${java.class.path}:${sun.boot.class.path}:#{driver_jars.join(':')}",
+      :includeantRuntime => false
+
+    ant.tstamp do |ts|
+      ts.format(:property => 'TODAY', :pattern => 'yyyy-MM-dd HH:mm:ss')
+    end
+
+    begin
+      require 'arjdbc/version'
+    rescue LoadError
+      path = File.expand_path('../lib', File.dirname(__FILE__))
+      unless $LOAD_PATH.include?(path)
+        $LOAD_PATH << path; retry
+      end
+    end
+
+    gem_version = Gem::Version.create(ArJdbc::VERSION)
+    if gem_version.segments.last == 'DEV'
+      version = gem_version.segments[0...-1] # 1.3.0.DEV -> 1.3.0
+    else
+      version = gem_version.segments.dup
+    end
+    version = version.join('.')
+    
+    ant.manifest :file => 'MANIFEST.MF' do |mf|
+      mf.attribute :name => 'Built-By', :value => '${user.name}'
+      mf.attribute :name => 'Built-Time', :value => '${TODAY}'
+      mf.attribute :name => 'Built-Jdk', :value => '${java.version}'
+      mf.attribute :name => 'Built-JRuby', :value => JRUBY_VERSION
+      
+      mf.attribute :name => 'Specification-Title', :value => 'ActiveRecord-JDBC'
+      mf.attribute :name => 'Specification-Version', :value => '1.3'
+      mf.attribute :name => 'Specification-Vendor', :value => 'JRuby'
+      mf.attribute :name => 'Implementation-Version', :value => version
+      mf.attribute :name => 'Implementation-Vendor', :value => 'The JRuby Team'
+    end
+    
+    ant.jar :basedir => "pkg/classes", :includes => "**/*.class", 
+            :destfile => jar_file, :manifest => 'MANIFEST.MF'
+  end
+
+  desc "Compile the native Java code."
+  task :jar => jar_file
+  
+  namespace :jar do
+    task :force do
+      rm jar_file if File.exist?(jar_file)
+      Rake::Task['jar'].invoke
+    end
+  end
+  
+rescue LoadError
+  task :jar do
+    puts "Run 'jar' with JRuby to re-compile the agent extension class"
+  end
+end

data/rakelib/db.rake

@@ -4,35 +4,25 @@ namespace :db do
   task :mysql do
     require File.expand_path('../../test/shared_helper', __FILE__)
     fail "could not create test database: mysql executable not found" unless mysql = which('mysql')
-
     load 'test/db/mysql_config.rb' # rescue nil
     enc = MYSQL_CONFIG[:encoding] || 'utf8' # 'utf8mb4'
     puts MYSQL_CONFIG.inspect if $VERBOSE
-
-    clean_script = sql_script <<-SQL, 'mysqlclean'
-DROP USER #{MYSQL_CONFIG[:username]}@localhost;
-    SQL
-
+    # DROP USER arjdbc@localhost; __ERROR 1396 (HY000): Operation CREATE USER failed__
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
 CREATE DATABASE `#{MYSQL_CONFIG[:database]}` DEFAULT CHARACTER SET `#{enc}` COLLATE `#{enc}_general_ci`;
-CREATE USER #{MYSQL_CONFIG[:username]}@localhost IDENTIFIED BY '#{MYSQL_CONFIG[:password]}';
 GRANT ALL PRIVILEGES ON `#{MYSQL_CONFIG[:database]}`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
+SET PASSWORD FOR #{MYSQL_CONFIG[:username]}@localhost = PASSWORD('#{MYSQL_CONFIG[:password]}');
     SQL
-
     params = { '-u' => 'root' }
-    if ENV['DATABASE_YML']
-      require 'yaml'
-      params['-p'] = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
+    if ENV['DATABASE_YML']; require 'yaml'
+    params['-p'] = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
     end
     params['-u'] = ENV['MY_USER'] if ENV['MY_USER']
     params['-p'] = ENV['MY_PASSWORD'] if ENV['MY_PASSWORD']
-
     puts "Creating MySQL (test) database: #{MYSQL_CONFIG[:database]}"
-    mysql_cmd = "#{mysql} -f #{params.map {|k, v| "#{k}#{v}"}.join(' ')}"
-    sh "cat #{clean_script.path} | #{mysql_cmd}", verbose: false
-    sh "cat #{script.path} | #{mysql_cmd}", verbose: $VERBOSE # so password is not echoed
+    sh "cat #{script.path} | #{mysql} -f #{params.map {|k, v| "#{k}#{v}"}.join(' ')}", :verbose => $VERBOSE # so password is not echoed
   end
 
   desc "Creates the test database for PostgreSQL"
@@ -40,10 +30,8 @@ GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
     require File.expand_path('../../test/shared_helper', __FILE__)
     fail 'could not create test database: psql executable not found' unless psql = which('psql')
     fail 'could not create test database: missing "postgres" role' unless PostgresHelper.postgres_role?
-
     load 'test/db/postgres_config.rb' # rescue nil
     puts POSTGRES_CONFIG.inspect if $VERBOSE
-
     script = sql_script <<-SQL, 'psql'
 DROP DATABASE IF EXISTS #{POSTGRES_CONFIG[:database]};
 DROP USER IF EXISTS #{POSTGRES_CONFIG[:username]};
@@ -52,14 +40,12 @@ CREATE DATABASE #{POSTGRES_CONFIG[:database]} OWNER #{POSTGRES_CONFIG[:username]
        TEMPLATE template0
        ENCODING '#{POSTGRES_CONFIG[:encoding]}' LC_COLLATE '#{POSTGRES_CONFIG[:collate]}' LC_CTYPE '#{POSTGRES_CONFIG[:collate]}';
     SQL
-
     params = { '-U' => ENV['PSQL_USER'] || 'postgres' }
     params['-q'] = nil unless $VERBOSE
-
     puts "Creating PostgreSQL (test) database: #{POSTGRES_CONFIG[:database]}"
-    sh "cat #{script.path} | #{psql} #{params.to_a.join(' ')}", verbose: $VERBOSE
+    sh "cat #{script.path} | #{psql} #{params.to_a.join(' ')}", :verbose => $VERBOSE
   end
-  task postgres: :postgresql
+  task :postgres => :postgresql
 
   private
 

data/rakelib/rails.rake

@@ -9,15 +9,14 @@ namespace :rails do
       if ENV['RAILS']
         ar_path = File.join(ENV['RAILS'], 'activerecord')
       end
-
+      
       unless ar_path && File.exist?(ar_path)
-        ar_path = `bundle info --path activerecord`.lines.last.chomp
+        ar_path = `bundle info --path activerecord`.chomp
       end
 
       unless File.exist? ar_test_dir = File.join(ar_path, 'test')
         raise "can not directly load Rails tests;" +
-              " try setting a local repository path e.g. export RAILS=`pwd`/../rails;" +
-              " failed guess: #{ar_path}"
+              " try setting a local repository path e.g. export RAILS=`pwd`/../rails"
       end
 
       driver = "jdbc-#{ENV['DRIVER'] ? ENV['DRIVER'].downcase : (adapter =~ /postgres/i ? 'postgres' : adapter)}"
@@ -51,7 +50,7 @@ namespace :rails do
       ruby_opts_string += " -C \"#{ar_path}\""
       ruby_opts_string += " -rbundler/setup"
       ruby_opts_string += " -rminitest -rminitest/excludes" unless ENV['NO_EXCLUDES'].eql?('true')
-      file_list = ENV["TEST"] ? FileList[ ENV["TEST"].split(',') ] : test_files_finder.call
+      file_list = ENV["TEST"] ? FileList[ ENV["TEST"] ] : test_files_finder.call
       file_list_string = file_list.map { |fn| "\"#{fn}\"" }.join(' ')
       # test_loader_code = "-e \"ARGV.each{|f| require f}\"" # :direct
       option_list = ( ENV["TESTOPTS"] || ENV["TESTOPT"] || ENV["TEST_OPTS"] || '' )

data/src/java/arjdbc/ArJdbcModule.java

@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import org.jruby.NativeException;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -147,7 +148,13 @@ public class ArJdbcModule {
             }
         }
         catch (ClassNotFoundException e) { /* ignored */ }
-        catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+        catch (NoSuchMethodException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (IllegalAccessException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (InvocationTargetException e) {
             throw newNativeException(runtime, e);
         }
 
@@ -256,15 +263,18 @@ public class ArJdbcModule {
         try {
             return klass.getMethod(name, argType).invoke(null, arg);
         }
-        catch (IllegalAccessException | InvocationTargetException e) {
+        catch (IllegalAccessException e) {
+            throw newNativeException(runtime, e);
+        }
+        catch (InvocationTargetException e) {
             throw newNativeException(runtime, e);
         }
     }
 
     private static RaiseException newNativeException(final Ruby runtime, final Throwable cause) {
-        final RaiseException error = runtime.newRuntimeError(cause.toString());
-        error.initCause(cause);
-        return error;
+        RubyClass nativeClass = runtime.getClass(NativeException.CLASS_NAME);
+        NativeException nativeException = new NativeException(runtime, nativeClass, cause);
+        return new RaiseException(cause, nativeException);
     }
 
     @JRubyMethod(meta = true)

data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java

@@ -83,8 +83,8 @@ public class DerbyRubyJdbcConnection extends RubyJdbcConnection {
             final int minor = jdbcDriver.getMinorVersion();
             if ( major < 10 || ( major == 10 && minor < 5 ) ) {
                 final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
-                throw context.runtime.newRaiseException(errorClass,
-                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "");
+                throw new RaiseException(context.runtime, errorClass,
+                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "", false);
             }
             if ( major == 10 && minor < 8 ) { // 10.8 ~ supports JDBC 4.1
                 // config[:connection_alive_sql] ||= 'SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY'

data/src/java/arjdbc/jdbc/ConnectionFactory.java

@@ -27,6 +27,12 @@ package arjdbc.jdbc;
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import javax.sql.DataSource;
+
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
 
 /**
  * Interface to be implemented in Ruby for retrieving a new connection.
@@ -43,3 +49,84 @@ public interface ConnectionFactory {
     Connection newConnection() throws SQLException;
 
 }
+
+class DataSourceConnectionFactoryImpl implements ConnectionFactory {
+
+    private final DataSource dataSource;
+    final String username, password; // optional
+
+    public DataSourceConnectionFactoryImpl(final DataSource dataSource) {
+        this.dataSource = dataSource;
+        this.username = null; this.password = null;
+    }
+
+    public DataSourceConnectionFactoryImpl(final DataSource dataSource,
+        final String username, final String password) {
+        this.dataSource = dataSource;
+        this.username = username; this.password = password;
+    }
+
+    @Override
+    public Connection newConnection() throws SQLException {
+        if ( username != null ) {
+            dataSource.getConnection(username, password);
+        }
+        return dataSource.getConnection();
+    }
+
+    DataSource getDataSource() { return dataSource; } /* for tests */
+
+}
+
+class DriverConnectionFactoryImpl implements ConnectionFactory {
+
+    private final DriverWrapper driverWrapper;
+    final String url;
+    final String username, password; // null allowed
+
+    public DriverConnectionFactoryImpl(final DriverWrapper driver, final String url) {
+        this.driverWrapper = driver; this.url = url;
+        this.username = null; this.password = null;
+    }
+
+    public DriverConnectionFactoryImpl(final DriverWrapper driver, final String url,
+        final String username, final String password) {
+        this.driverWrapper = driver; this.url = url;
+        this.username = username; this.password = password;
+    }
+
+    @Override
+    public Connection newConnection() throws SQLException {
+        return driverWrapper.connect(url, username, password);
+    }
+
+    DriverWrapper getDriverWrapper() { return driverWrapper; } /* for tests */
+
+}
+
+// @legacy ActiveRecord::ConnectionAdapters::JdbcDriver
+class RubyConnectionFactoryImpl implements ConnectionFactory {
+
+    private final IRubyObject driver;
+    final RubyString url;
+    final IRubyObject username, password; // null allowed
+
+    private final RubyObject contextProvider;
+
+    public RubyConnectionFactoryImpl(final IRubyObject driver, final RubyString url,
+        final IRubyObject username, final IRubyObject password) {
+        this.driver = driver; this.url = url;
+        this.username = username; this.password = password;
+        contextProvider = (RubyObject) driver;
+    }
+
+    @Override
+    public Connection newConnection() throws SQLException {
+        final ThreadContext context = contextProvider.getRuntime().getCurrentContext();
+        final IRubyObject connection = driver.callMethod(context, "connection", new IRubyObject[] { url, username, password });
+        return (Connection) connection.toJava(Connection.class);
+    }
+
+    IRubyObject getDriver() { return driver; } /* for tests */
+
+}

data/src/java/arjdbc/jdbc/DataSourceConnectionFactory.java

@@ -68,6 +68,7 @@ final class DataSourceConnectionFactory implements ConnectionFactory {
 
     @Override
     public Connection newConnection() throws SQLException {
+        DataSource dataSource = this.dataSource;
         // in case DS failed previously look it up again from JNDI :
         if (dataSource == null) {
             lookupDataSource();

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -128,7 +128,6 @@ public class RubyJdbcConnection extends RubyObject {
     private boolean lazy = false; // final once set on initialize
     private boolean jndi; // final once set on initialize
     private boolean configureConnection = true; // final once initialized
-    private int fetchSize = 0; // 0 = JDBC default
 
     protected RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
@@ -487,7 +486,7 @@ public class RubyJdbcConnection extends RubyObject {
                 savepoint = ((IRubyObject) savepoint).toJava(Savepoint.class);
             }
 
-            releaseSavepoint(connection, (Savepoint) savepoint);
+            connection.releaseSavepoint((Savepoint) savepoint);
             return context.nil;
         }
         catch (SQLException e) {
@@ -495,11 +494,6 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    // MSSQL doesn't support releasing savepoints so we make it possible to override the actual release action
-    protected void releaseSavepoint(final Connection connection, final Savepoint savepoint) throws SQLException {
-        connection.releaseSavepoint(savepoint);
-    }
-
     protected static RuntimeException newSavepointNotSetError(final ThreadContext context, final IRubyObject name, final String op) {
         RubyClass StatementInvalid = ActiveRecord(context).getClass("StatementInvalid");
         return context.runtime.newRaiseException(StatementInvalid, "could not " + op + " savepoint: '" + name + "' (not set)");
@@ -577,11 +571,6 @@ public class RubyJdbcConnection extends RubyObject {
         else {
             this.configureConnection = value != context.runtime.getFalse();
         }
-
-        IRubyObject jdbcFetchSize = getConfigValue(context, "jdbc_fetch_size");
-        if (jdbcFetchSize != context.nil) {
-            this.fetchSize = RubyNumeric.fix2int(jdbcFetchSize);
-        }
     }
 
     @JRubyMethod(name = "adapter")
@@ -727,10 +716,7 @@ public class RubyJdbcConnection extends RubyObject {
 
     private void connectImpl(final boolean forceConnection) throws SQLException {
         setConnection( forceConnection ? newConnection() : null );
-        if (forceConnection) {
-            if (getConnectionImpl() == null) throw new SQLException("Didn't get a connection. Wrong URL?");
-            configureConnection();
-        }
+        if ( forceConnection ) configureConnection();
     }
 
     @JRubyMethod(name = "read_only?")
@@ -832,7 +818,6 @@ public class RubyJdbcConnection extends RubyObject {
                             // is called, so we have to process the result sets as we get them
                             // this shouldn't be an issue in most cases since we're only getting 1 result set anyways
                             result = mapExecuteResult(context, connection, resultSet);
-                            resultSet.close();
                         } else {
                             result = context.runtime.newFixnum(updateCount);
                         }
@@ -866,7 +851,6 @@ public class RubyJdbcConnection extends RubyObject {
         else {
             statement.setEscapeProcessing(escapeProcessing.isTrue());
         }
-        if (fetchSize != 0) statement.setFetchSize(fetchSize);
         return statement;
     }
 
@@ -888,31 +872,15 @@ public class RubyJdbcConnection extends RubyObject {
         return mapQueryResult(context, connection, resultSet);
     }
 
-    private static String[] createStatementPk(IRubyObject pk) {
-        String[] statementPk;
-        if (pk instanceof RubyArray) {
-            RubyArray ary = (RubyArray) pk;
-            int size = ary.size();
-            statementPk = new String[size];
-            for (int i = 0; i < size; i++) {
-                statementPk[i] = sqlString(ary.eltInternal(i));
-            }
-        } else {
-            statementPk = new String[] { sqlString(pk) };
-        }
-        return statementPk;
-    }
-
     /**
      * Executes an INSERT SQL statement
      * @param context
      * @param sql
-     * @param pk Rails PK
      * @return ActiveRecord::Result
      * @throws SQLException
      */
-    @JRubyMethod(name = "execute_insert_pk", required = 2)
-    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject pk) {
+    @JRubyMethod(name = "execute_insert", required = 1)
+    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 Statement statement = null;
@@ -920,13 +888,7 @@ public class RubyJdbcConnection extends RubyObject {
                 try {
 
                     statement = createStatement(context, connection);
-
-                    if (pk == context.nil || pk == context.fals || !supportsGeneratedKeys(connection)) {
-                        statement.executeUpdate(query, Statement.RETURN_GENERATED_KEYS);
-                    } else {
-                        statement.executeUpdate(query, createStatementPk(pk));
-                    }
-
+                    statement.executeUpdate(query, Statement.RETURN_GENERATED_KEYS);
                     return mapGeneratedKeys(context, connection, statement);
 
                 } catch (final SQLException e) {
@@ -939,35 +901,23 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    @Deprecated
-    @JRubyMethod(name = "execute_insert", required = 1)
-    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql) {
-        return execute_insert_pk(context, sql, context.nil);
-    }
-
     /**
      * Executes an INSERT SQL statement using a prepared statement
      * @param context
      * @param sql
      * @param binds RubyArray of values to be bound to the query
-     * @param pk Rails PK
      * @return ActiveRecord::Result
      * @throws SQLException
      */
-    @JRubyMethod(name = "execute_insert_pk", required = 3)
-    public IRubyObject execute_insert_pk(final ThreadContext context, final IRubyObject sql, final IRubyObject binds,
-                                         final IRubyObject pk) {
+    @JRubyMethod(name = "execute_insert", required = 2)
+    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject sql, final IRubyObject binds) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
                 PreparedStatement statement = null;
                 final String query = sqlString(sql);
                 try {
-                    if (pk == context.nil || pk == context.fals || !supportsGeneratedKeys(connection)) {
-                        statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
-                    } else {
-                        statement = connection.prepareStatement(query, createStatementPk(pk));
-                    }
 
+                    statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
                     setStatementParameters(context, connection, statement, (RubyArray) binds);
                     statement.executeUpdate();
                     return mapGeneratedKeys(context, connection, statement);
@@ -982,12 +932,6 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    @Deprecated
-    @JRubyMethod(name = "execute_insert", required = 2)
-    public IRubyObject execute_insert(final ThreadContext context, final IRubyObject binds, final IRubyObject sql) {
-        return execute_insert_pk(context, sql, binds, context.nil);
-    }
-
     /**
      * Executes an UPDATE (DELETE) SQL statement
      * @param context
@@ -1101,7 +1045,6 @@ public class RubyJdbcConnection extends RubyObject {
                     else {
                         final PreparedStatement prepStatement;
                         statement = prepStatement = connection.prepareStatement(query);
-                        if (fetchSize != 0) statement.setFetchSize(fetchSize);
                         statement.setMaxRows(maxRows); // zero means there is no limit
                         setStatementParameters(context, connection, prepStatement, binds);
                         hasResult = prepStatement.execute();
@@ -1169,24 +1112,6 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    /**
-     * Prepares a query, returns a wrapped PreparedStatement. This takes care of exception wrapping
-     * @param context which context this method is executing on.
-     * @param sql the query to prepare-
-     * @return a Ruby <code>PreparedStatement</code>
-     */
-    @JRubyMethod(required = 1)
-    public IRubyObject prepare_statement(final ThreadContext context, final IRubyObject sql) {
-        return withConnection(context, new Callable<IRubyObject>() {
-            public IRubyObject call(Connection connection) throws SQLException {
-                final String query = sql.convertToString().getUnicodeValue();
-                PreparedStatement statement = connection.prepareStatement(query);
-                if (fetchSize != 0) statement.setFetchSize(fetchSize);
-                return JavaUtil.convertJavaToRuby(context.runtime, statement);
-            }
-        });
-    }
-
     // Called from exec_query in abstract/database_statements
     /**
      * Executes a query and returns the (AR) result.  There are three parameters:
@@ -1217,7 +1142,6 @@ public class RubyJdbcConnection extends RubyObject {
                         statement = (PreparedStatement) JavaEmbedUtils.rubyToJava(cachedStatement);
                     } else {
                         statement = connection.prepareStatement(query);
-                        if (fetchSize != 0) statement.setFetchSize(fetchSize);
                     }
 
                     setStatementParameters(context, connection, statement, (RubyArray) binds);
@@ -1225,7 +1149,12 @@ public class RubyJdbcConnection extends RubyObject {
                     if (statement.execute()) {
                         ResultSet resultSet = statement.getResultSet();
                         IRubyObject results = mapQueryResult(context, connection, resultSet);
-                        resultSet.close();
+
+                        if (cached) {
+                            // Make sure we free the result set if we are caching the statement
+                            // It gets closed automatically when the statement is closed if we aren't caching
+                            resultSet.close();
+                        }
 
                         return results;
                     } else {
@@ -1878,7 +1807,7 @@ public class RubyJdbcConnection extends RubyObject {
         if ( url.isNil() || ( driver.isNil() && driver_instance.isNil() ) ) {
             final Ruby runtime = context.runtime;
             final RubyClass errorClass = getConnectionNotEstablished( runtime );
-            throw runtime.newRaiseException(errorClass, "adapter requires :driver class and jdbc :url");
+            throw new RaiseException(runtime, errorClass, "adapter requires :driver class and jdbc :url", false);
         }
 
         final String jdbcURL = buildURL(context, url);
@@ -1895,7 +1824,7 @@ public class RubyJdbcConnection extends RubyObject {
                 return factory;
             }
             else {
-                setConnectionFactory(factory = new RubyConnectionFactory(
+                setConnectionFactory(factory = new RubyConnectionFactoryImpl(
                         driver_instance, context.runtime.newString(jdbcURL),
                         ( username.isNil() ? username : username.asString() ),
                         ( password.isNil() ? password : password.asString() )
@@ -2556,8 +2485,6 @@ public class RubyJdbcConnection extends RubyObject {
             while ( arrayResult.next() ) {
                 array.append( jdbcToRuby(context, runtime, 2, baseType, arrayResult) );
             }
-            arrayResult.close();
-
             return array;
         }
         finally { if ( value != null ) value.free(); }
@@ -2760,7 +2687,7 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     protected final RubyTime timeInDefaultTimeZone(final ThreadContext context, final IRubyObject value) {
-        return timeInDefaultTimeZone(context, DateTimeUtils.toTime(context, value));
+        return timeInDefaultTimeZone(context, toTime(context, value));
     }
 
     protected final RubyTime timeInDefaultTimeZone(final ThreadContext context, final RubyTime time) {
@@ -2772,14 +2699,11 @@ public class RubyJdbcConnection extends RubyObject {
         return timeInDefaultTZ;
     }
 
-    protected final DateTime dateTimeInDefaultTimeZone(final ThreadContext context, final DateTime dateTime) {
-        final DateTimeZone defaultZone = getDefaultTimeZone(context);
-        if (defaultZone == dateTime.getZone()) return dateTime;
-        return dateTime.withZone(defaultZone);
-    }
-
     public static RubyTime toTime(final ThreadContext context, final IRubyObject value) {
-        return DateTimeUtils.toTime(context, value);
+        if ( ! ( value instanceof RubyTime ) ) { // unlikely
+            return (RubyTime) TypeConverter.convertToTypeWithCheck(value, context.runtime.getTime(), "to_time");
+        }
+        return (RubyTime) value;
     }
 
     protected boolean isDefaultTimeZoneUTC(final ThreadContext context) {
@@ -2879,8 +2803,8 @@ public class RubyJdbcConnection extends RubyObject {
         final int index, IRubyObject value,
         final IRubyObject attribute, final int type) throws SQLException {
 
-        final RubyTime timeValue = DateTimeUtils.toTime(context, value);
-        final DateTime dateTime = dateTimeInDefaultTimeZone(context, timeValue.getDateTime());
+        final RubyTime timeValue = timeInDefaultTimeZone(context, value);
+        final DateTime dateTime = timeValue.getDateTime();
         final Timestamp timestamp = new Timestamp(dateTime.getMillis());
         // 1942-11-30T01:02:03.123_456
         if (timeValue.getNSec() > 0) timestamp.setNanos((int) (timestamp.getNanos() + timeValue.getNSec()));
@@ -2974,7 +2898,7 @@ public class RubyJdbcConnection extends RubyObject {
         final RubySymbol type = (RubySymbol) attributeSQLType(context, attribute);
 
         // For some reason the driver doesn't like "character varying" as a type
-        if ( type.eql(context.runtime.newSymbol("string")) ) return "varchar";
+        if ( type.eql(context.runtime.newSymbol("string")) ) return "text";
 
         final RubyHash nativeTypes = (RubyHash) getAdapter().callMethod(context, "native_database_types");
         // e.g. `integer: { name: 'integer' }`
@@ -3081,7 +3005,7 @@ public class RubyJdbcConnection extends RubyObject {
     private void handleNotConnected() {
         final Ruby runtime = getRuntime();
         final RubyClass errorClass = getConnectionNotEstablished( runtime );
-        throw runtime.newRaiseException(errorClass, "no connection available");
+        throw new RaiseException(runtime, errorClass, "no connection available", false);
     }
 
     /**
@@ -3521,14 +3445,12 @@ public class RubyJdbcConnection extends RubyObject {
                 if ( ! gotConnection ) { // SQLException from driver/data-source
                     reconnectOnRetry = connected;
                 }
-                else if (!autoCommit) {
-                    // never retry inside a transaction
-                    break;
-                }
                 else if ( isTransient(exception) ) {
                     reconnectOnRetry = false; // continue;
                 }
                 else {
+                    if ( ! autoCommit ) break; // do not retry if (inside) transactions
+
                     if ( isConnectionValid(context, getConnectionImpl()) ) {
                         break; // connection not broken yet failed (do not retry)
                     }
@@ -3618,7 +3540,7 @@ public class RubyJdbcConnection extends RubyObject {
             return (RaiseException) exception;
         }
         if ( exception instanceof RuntimeException ) {
-            return wrapException(context, context.runtime.getRuntimeError(), exception);
+            return RaiseException.createNativeRaiseException(runtime, exception);
         }
         // NOTE: compat - maybe makes sense or maybe not (e.g. IOException) :
         return wrapException(context, getJDBCError(runtime), exception);
@@ -3631,7 +3553,7 @@ public class RubyJdbcConnection extends RubyObject {
 
     public static RaiseException wrapException(final ThreadContext context,
                                                final RubyClass errorClass, final Throwable exception, final String message) {
-        final RaiseException error = context.runtime.newRaiseException(errorClass, message);
+        final RaiseException error = new RaiseException(context.runtime, errorClass, message, true);
         error.initCause(exception);
         return error;
     }
@@ -3965,12 +3887,6 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    public static void debugMessage(final ThreadContext context, final IRubyObject obj) {
-        if ( isDebug(context.runtime) ) {
-            debugMessage(context.runtime, obj.callMethod(context, "inspect"));
-        }
-    }
-
     public static void debugMessage(final Ruby runtime, final String msg, final Object e) {
         if ( isDebug(runtime) ) {
             final PrintStream out = runtime != null ? runtime.getOut() : System.out;