activerecord-jdbc-adapter 1.2.5 → 1.2.8

data/lib/arjdbc/sybase/adapter.rb

@@ -31,12 +31,13 @@ module ArJdbc
       !@limit.nil? && @limit == 0
     end
 
-    def modify_types(tp) #:nodoc:
-      tp[:primary_key] = "NUMERIC(22,0) IDENTITY PRIMARY KEY"
-      tp[:integer][:limit] = nil
-      tp[:boolean] = {:name => "bit"}
-      tp[:binary] = {:name => "image"}
-      tp
+    def modify_types(types) # :nodoc:
+      super(types)
+      types[:primary_key] = "NUMERIC(22,0) IDENTITY PRIMARY KEY"
+      types[:integer][:limit] = nil
+      types[:boolean] = {:name => "bit"}
+      types[:binary] = {:name => "image"}
+      types
     end
 
     def remove_index(table_name, options = {})

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.2.5"
+    VERSION = "1.2.8"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/pom.xml

@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>1.5.3</version>
+      <version>1.6.8</version>
     </dependency>
   </dependencies>
 

data/rakelib/02-test.rake

@@ -1,4 +1,4 @@
-require File.expand_path '../../test/helper', __FILE__
+require File.expand_path('../../test/helper', __FILE__)
 if defined?(JRUBY_VERSION)
   databases = [ :test_mysql, :test_sqlite3, :test_derby, :test_hsqldb, :test_h2 ]
   databases << :test_postgres if PostgresHelper.have_postgres?(false)
@@ -20,16 +20,16 @@ def set_compat_version(task)
   end
 end
 
-def all_appraisal_names
-  @appraisal_names ||= begin names = []; Appraisal::File.each { |file| names << file.name }; names end
-end
-
 def declare_test_task_for(adapter, options = {})
   driver = options[:driver] || adapter
   prereqs = options[:prereqs] || []
   prereqs = [ prereqs ].flatten
   task "test_#{adapter}_pre" do
-    puts "Specify AR version with 'rake appraisal:{version} test_#{adapter}' where version=(#{all_appraisal_names.join('|')})"
+    unless (ENV['BUNDLE_GEMFILE'] rescue '') =~ /gemfiles\/.*?\.gemfile/
+      appraisals = []; Appraisal::File.each { |file| appraisals << file.name }
+      puts "Specify AR version with `rake appraisal:{version} test_#{adapter}'" + 
+           " where version=(#{appraisals.join('|')})"
+    end
   end
   prereqs << "test_#{adapter}_pre"
   test_task = lambda do |t|
@@ -43,12 +43,11 @@ def declare_test_task_for(adapter, options = {})
     t.libs = []
     set_compat_version(t)
     if defined?(JRUBY_VERSION)
-      t.ruby_opts << "-rjdbc/#{driver}"
       t.libs << "lib" << "jdbc-#{driver}/lib"
       t.libs.push *FileList["activerecord-jdbc#{adapter}*/lib"]
     end
     t.libs << "test"
-    t.verbose = true
+    t.verbose = true if $VERBOSE
   end
   Rake::TestTask.new("test_#{adapter}" => prereqs) { |t| test_task.call t }
   Rake::TestTask.new("test_jdbc_#{adapter}" => prereqs) { |t| test_task.call t }
@@ -64,12 +63,11 @@ declare_test_task_for :sqlite3
 
 Rake::TestTask.new(:test_jdbc) do |t|
   t.test_files = FileList['test/generic_jdbc_connection_test.rb']
-  t.libs << 'test' << 'jdbc-mysql/lib'
+  t.libs << 'test' << 'jdbc-mysql/lib' << 'jdbc-derby/lib'
   set_compat_version(t)
 end
 
-Rake::TestTask.new(:test_jndi) do |t|
-  Rake::Task['tomcat-jndi:check'].invoke
+Rake::TestTask.new(:test_jndi => 'tomcat-jndi:check') do |t|
   t.test_files = FileList['test/jndi_test.rb']
   t.libs << 'test' << 'jdbc-derby/lib'
   set_compat_version(t)

data/rakelib/rails.rake

@@ -27,15 +27,23 @@ namespace :rails do
   end
 
   task :test => :jar do
-    driver = ENV['DRIVER']
-    raise "need a DRIVER" unless driver
-    activerecord = ENV['RAILS']
-    raise "need location of RAILS source code" unless activerecord
-    activerecord = File.join(activerecord, 'activerecord') unless activerecord =~ /activerecord$/
-    ar_jdbc = File.expand_path(File.dirname(__FILE__) + '/..')
-    rubylib = "#{ar_jdbc}/lib:#{ar_jdbc}/jdbc-#{_driver(driver)}/lib:#{ar_jdbc}/activerecord-jdbc#{_adapter(driver)}-adapter/lib"
-    Dir.chdir(activerecord) do
-      rake "RUBYLIB=#{rubylib}", "#{_target(driver)}"
-    end
+    raise "need a DRIVER" unless driver = ENV['DRIVER']
+    raise "need location of RAILS source code" unless rails_dir = ENV['RAILS']
+    rails_dir = File.join(rails_dir, '..') if rails_dir =~ /activerecord$/
+    activerecord_dir = File.join(rails_dir, 'activerecord') # rails/activerecord
+
+    ar_jdbc_dir = File.expand_path('..', File.dirname(__FILE__))
+
+    rubylib = [ 
+      "#{ar_jdbc_dir}/lib",
+      "#{ar_jdbc_dir}/jdbc-#{_driver(driver)}/lib",
+      "#{ar_jdbc_dir}/activerecord-jdbc#{_adapter(driver)}-adapter/lib"
+    ]
+    rubylib << File.expand_path('activesupport/lib', rails_dir)
+    rubylib << File.expand_path('activemodel/lib', rails_dir)
+    rubylib << File.expand_path(File.join(activerecord_dir, 'lib'))
+    #rubylib << File.expand_path('actionpack/lib', rails_dir)
+
+    Dir.chdir(activerecord_dir) { rake "RUBYLIB=#{rubylib.join(':')}", "#{_target(driver)}" }
   end
 end

data/src/java/arjdbc/db2/DB2Module.java

@@ -0,0 +1,70 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Karol Bucek.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package arjdbc.db2;
+
+import static arjdbc.util.QuotingUtils.BYTES_0;
+import static arjdbc.util.QuotingUtils.BYTES_1;
+import static arjdbc.util.QuotingUtils.quoteSingleQuotesWithFallback;
+
+import org.jruby.RubyModule;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * ArJdbc::DB2
+ * 
+ * @author kares
+ */
+public class DB2Module {
+    
+    public static void load(final RubyModule arJdbc) {
+        RubyModule db2 = arJdbc.defineModuleUnder("DB2");
+        db2.defineAnnotatedMethods( DB2Module.class );
+    }
+    
+    @JRubyMethod(name = "quote_string", required = 1, frame = false)
+    public static IRubyObject quote_string(
+            final ThreadContext context, 
+            final IRubyObject self, 
+            final IRubyObject string) {
+        return quoteSingleQuotesWithFallback(context, string);
+    }
+    
+    @JRubyMethod(name = "quoted_true", required = 0, frame = false)
+    public static IRubyObject quoted_true(
+            final ThreadContext context, 
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_1);
+    }
+    
+    @JRubyMethod(name = "quoted_false", required = 0, frame = false)
+    public static IRubyObject quoted_false(
+            final ThreadContext context, 
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_0);
+    }
+    
+}

data/src/java/arjdbc/derby/DerbyModule.java

@@ -26,27 +26,32 @@ package arjdbc.derby;
 
 import java.sql.SQLException;
 
+import static arjdbc.util.QuotingUtils.BYTES_0;
+import static arjdbc.util.QuotingUtils.BYTES_1;
+
 import arjdbc.jdbc.RubyJdbcConnection;
 
 import org.jruby.Ruby;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyModule;
 import org.jruby.RubyObjectAdapter;
-import org.jruby.RubyRange;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
 public class DerbyModule {
+    
     private static RubyObjectAdapter rubyApi;
-    public static void load(RubyModule arJdbc, RubyObjectAdapter adapter) {
+    
+    public static void load(final RubyModule arJdbc) {
         RubyModule derby = arJdbc.defineModuleUnder("Derby");
         derby.defineAnnotatedMethods(DerbyModule.class);
         RubyModule column = derby.defineModuleUnder("Column");
         column.defineAnnotatedMethods(Column.class);
-        rubyApi = adapter;
+        rubyApi = JavaEmbedUtils.newObjectAdapter();
     }
 
     public static class Column {
@@ -105,7 +110,7 @@ public class DerbyModule {
         IRubyObject value = args[0];
         if (args.length > 1) {
             IRubyObject col = args[1];
-            String type = rubyApi.callMethod(col, "type").toString();
+            String type = col.isNil() ? "" : rubyApi.callMethod(col, "type").toString();
             // intercept and change value, maybe, if the column type is :text or :string
             if (type.equals("text") || type.equals("string")) {
             	value = make_ruby_string_for_text_column(context, recv, runtime, value);
@@ -208,7 +213,7 @@ public class DerbyModule {
 
     private static IRubyObject quote_string_with_surround(Ruby runtime, String before, RubyString string, String after) {
         ByteList input = string.getByteList();
-        ByteList output = new ByteList(before.getBytes());
+        ByteList output = new ByteList(before.getBytes(), input.encoding);
         for(int i = input.begin; i< input.begin + input.realSize; i++) {
             switch(input.bytes[i]) {
             case '\'':
@@ -286,6 +291,20 @@ public class DerbyModule {
         }
     }
 
+    @JRubyMethod(name = "quoted_true", required = 0, frame = false)
+    public static IRubyObject quoted_true(
+            final ThreadContext context, 
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_1);
+    }
+    
+    @JRubyMethod(name = "quoted_false", required = 0, frame = false)
+    public static IRubyObject quoted_false(
+            final ThreadContext context, 
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_0);
+    }
+    
     @JRubyMethod(name = "select_all", rest = true)
     public static IRubyObject select_all(IRubyObject recv, IRubyObject[] args) {
         return rubyApi.callMethod(recv, "execute", args);

data/src/java/arjdbc/hsqldb/HSQLDBModule.java

@@ -0,0 +1,66 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ***** END LICENSE BLOCK *****/
+
+package arjdbc.hsqldb;
+
+import static arjdbc.util.QuotingUtils.BYTES_0;
+import static arjdbc.util.QuotingUtils.BYTES_1;
+import static arjdbc.util.QuotingUtils.quoteSingleQuotesWithFallback;
+
+import org.jruby.RubyModule;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+public class HSQLDBModule {
+    
+    public static void load(final RubyModule arJdbc) {
+        RubyModule hsqldb = arJdbc.defineModuleUnder("HSQLDB");
+        hsqldb.defineAnnotatedMethods(HSQLDBModule.class);
+    }
+    
+    @JRubyMethod(name = "quote_string", required = 1, frame = false)
+    public static IRubyObject quote_string(
+            final ThreadContext context, 
+            final IRubyObject self, 
+            final IRubyObject string) {
+        return quoteSingleQuotesWithFallback(context, string);
+    }
+    
+    @JRubyMethod(name = "quoted_true", required = 0, frame = false)
+    public static IRubyObject quoted_true(
+            final ThreadContext context, 
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_1);
+    }
+    
+    @JRubyMethod(name = "quoted_false", required = 0, frame = false)
+    public static IRubyObject quoted_false(
+            final ThreadContext context, 
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_0);
+    }
+    
+}

data/src/java/arjdbc/jdbc/AdapterJavaService.java

@@ -28,41 +28,48 @@ package arjdbc.jdbc;
 
 import java.io.IOException;
 
+import arjdbc.db2.DB2Module;
 import arjdbc.db2.DB2RubyJdbcConnection;
 import arjdbc.derby.DerbyModule;
 import arjdbc.h2.H2RubyJdbcConnection;
+import arjdbc.hsqldb.HSQLDBModule;
 import arjdbc.informix.InformixRubyJdbcConnection;
 import arjdbc.mssql.MssqlRubyJdbcConnection;
 import arjdbc.mysql.MySQLModule;
 import arjdbc.mysql.MySQLRubyJdbcConnection;
+import arjdbc.oracle.OracleModule;
 import arjdbc.oracle.OracleRubyJdbcConnection;
 import arjdbc.postgresql.PostgresqlRubyJdbcConnection;
-import arjdbc.sqlite3.Sqlite3RubyJdbcConnection;
+import arjdbc.sqlite3.SQLite3Module;
+import arjdbc.sqlite3.SQLite3RubyJdbcConnection;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyModule;
-import org.jruby.RubyObjectAdapter;
-import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.runtime.load.BasicLibraryService;
 
 public class AdapterJavaService implements BasicLibraryService {
-    private static RubyObjectAdapter rubyApi;
 
     public boolean basicLoad(final Ruby runtime) throws IOException {
+        // ActiveRecord::ConnectionAdapter-s :
         RubyClass jdbcConnection = RubyJdbcConnection.createJdbcConnectionClass(runtime);
         PostgresqlRubyJdbcConnection.createPostgresqlJdbcConnectionClass(runtime, jdbcConnection);
         MssqlRubyJdbcConnection.createMssqlJdbcConnectionClass(runtime, jdbcConnection);
         InformixRubyJdbcConnection.createInformixJdbcConnectionClass(runtime, jdbcConnection);
         OracleRubyJdbcConnection.createOracleJdbcConnectionClass(runtime, jdbcConnection);
-        Sqlite3RubyJdbcConnection.createSqlite3JdbcConnectionClass(runtime, jdbcConnection);
+        SQLite3RubyJdbcConnection.createSQLite3JdbcConnectionClass(runtime, jdbcConnection);
         H2RubyJdbcConnection.createH2JdbcConnectionClass(runtime, jdbcConnection);
         MySQLRubyJdbcConnection.createMySQLJdbcConnectionClass(runtime, jdbcConnection);
         DB2RubyJdbcConnection.createDB2JdbcConnectionClass(runtime, jdbcConnection);
+        // ArJdbc :
         RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
-        rubyApi = JavaEmbedUtils.newObjectAdapter();
         MySQLModule.load(arJdbc);
-        DerbyModule.load(arJdbc, rubyApi);
+        DerbyModule.load(arJdbc);
+        HSQLDBModule.load(arJdbc);
+        SQLite3Module.load(arJdbc);
+        OracleModule.load(arJdbc);
+        DB2Module.load(arJdbc);
         return true;
     }
+    
 }

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

@@ -61,14 +61,14 @@ import org.jruby.RubySymbol;
 import org.jruby.RubyTime;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.Java;
 import org.jruby.javasupport.JavaEmbedUtils;
-import org.jruby.javasupport.JavaObject;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.backtrace.RubyStackTraceElement;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
@@ -85,9 +85,15 @@ public class RubyJdbcConnection extends RubyObject {
         super(runtime, metaClass);
     }
 
-    public static RubyClass createJdbcConnectionClass(Ruby runtime) {
-        RubyClass jdbcConnection = getConnectionAdapters(runtime).defineClassUnder("JdbcConnection",
-                runtime.getObject(), JDBCCONNECTION_ALLOCATOR);
+    private static ObjectAllocator JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new RubyJdbcConnection(runtime, klass);
+        }
+    };
+    
+    public static RubyClass createJdbcConnectionClass(final Ruby runtime) {
+        RubyClass jdbcConnection = getConnectionAdapters(runtime).
+            defineClassUnder("JdbcConnection", runtime.getObject(), JDBCCONNECTION_ALLOCATOR);
         jdbcConnection.defineAnnotatedMethods(RubyJdbcConnection.class);
 
         rubyApi = JavaEmbedUtils.newObjectAdapter();
@@ -95,31 +101,14 @@ public class RubyJdbcConnection extends RubyObject {
         return jdbcConnection;
     }
 
-    private static ObjectAllocator JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new RubyJdbcConnection(runtime, klass);
-        }
-    };
-
     protected static RubyModule getConnectionAdapters(Ruby runtime) {
         return (RubyModule) runtime.getModule("ActiveRecord").getConstant("ConnectionAdapters");
     }
-
+    
     protected String[] getTableTypes() {
         return TABLE_TYPES;
     }
 
-    @JRubyMethod(name = "begin")
-    public IRubyObject begin(ThreadContext context) throws SQLException {
-        final Ruby runtime = context.getRuntime();
-        return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
-          public Object call(Connection c) throws SQLException {
-            getConnection(true).setAutoCommit(false);
-            return runtime.getNil();
-          }
-        });
-    }
-
     @JRubyMethod(name = {"columns", "columns_internal"}, required = 1, optional = 2)
     public IRubyObject columns_internal(final ThreadContext context, final IRubyObject[] args)
             throws SQLException, IOException {
@@ -149,6 +138,17 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
+    @JRubyMethod(name = "begin")
+    public IRubyObject begin(ThreadContext context) throws SQLException {
+        final Ruby runtime = context.getRuntime();
+        return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
+          public Object call(Connection c) throws SQLException {
+            getConnection(true).setAutoCommit(false);
+            return runtime.getNil();
+          }
+        });
+    }
+    
     @JRubyMethod(name = "commit")
     public IRubyObject commit(ThreadContext context) throws SQLException {
         Connection connection = getConnection(true);
@@ -164,14 +164,39 @@ public class RubyJdbcConnection extends RubyObject {
         return context.getRuntime().getNil();
     }
 
-    @JRubyMethod(name = "connection", frame = false)
+    @JRubyMethod(name = "connection")
     public IRubyObject connection() {
-        if (getConnection() == null) reconnect();
-
+        if ( getConnection(false) == null ) { 
+            synchronized (this) {
+                if ( getConnection(false) == null ) {
+                    reconnect();
+                }
+            }
+        }
         return getInstanceVariable("@connection");
     }
 
-    @JRubyMethod(name = "database_name", frame = false)
+    @JRubyMethod(name = "disconnect!")
+    public IRubyObject disconnect(final ThreadContext context) {
+        // TODO: only here to try resolving multi-thread issues :
+        // https://github.com/jruby/activerecord-jdbc-adapter/issues/197
+        // https://github.com/jruby/activerecord-jdbc-adapter/issues/198
+        if ( Boolean.getBoolean("arjdbc.disconnect.debug") ) {
+            final Ruby runtime = context.getRuntime();
+            List backtrace = (List) context.createCallerBacktrace(runtime, 0);
+            runtime.getOut().println(this + " connection.disconnect! occured: ");
+            for ( Object element : backtrace ) runtime.getOut().println(element);
+            runtime.getOut().flush();
+        }
+        return setConnection(null);
+    }
+
+    @JRubyMethod(name = "reconnect!")
+    public IRubyObject reconnect() {
+        return setConnection( getConnectionFactory().newConnection() );
+    }
+    
+    @JRubyMethod(name = "database_name")
     public IRubyObject database_name(ThreadContext context) throws SQLException {
         Connection connection = getConnection(true);
         String name = connection.getCatalog();
@@ -185,12 +210,7 @@ public class RubyJdbcConnection extends RubyObject {
         return context.getRuntime().newString(name);
     }
 
-    @JRubyMethod(name = "disconnect!", frame = false)
-    public IRubyObject disconnect() {
-        return setConnection(null);
-    }
-
-    @JRubyMethod
+    @JRubyMethod(name = "execute", required = 1)
     public IRubyObject execute(final ThreadContext context, final IRubyObject sql) {
         return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
             public Object call(Connection c) throws SQLException {
@@ -481,11 +501,6 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    @JRubyMethod(name = "reconnect!")
-    public IRubyObject reconnect() {
-        return setConnection(getConnectionFactory().newConnection());
-    }
-
 
     @JRubyMethod(name = "rollback")
     public IRubyObject rollback(ThreadContext context) throws SQLException {
@@ -698,19 +713,6 @@ public class RubyJdbcConnection extends RubyObject {
         return runtime.newFloat(doubleValue);
     }
 
-    protected Connection getConnection() {
-        return getConnection(false);
-    }
-
-    protected Connection getConnection(boolean error) {
-        Connection conn = (Connection) dataGetStruct();
-        if(error && conn == null) {
-            RubyClass err = getRuntime().getModule("ActiveRecord").getClass("ConnectionNotEstablished");
-            throw new RaiseException(getRuntime(), err, "no connection available", false);
-        }
-        return conn;
-    }
-
     protected IRubyObject getAdapter(ThreadContext context) {
         return callMethod(context, "adapter");
     }
@@ -721,17 +723,21 @@ public class RubyJdbcConnection extends RubyObject {
 
     protected JdbcConnectionFactory getConnectionFactory() throws RaiseException {
         IRubyObject connection_factory = getInstanceVariable("@connection_factory");
-        JdbcConnectionFactory factory = null;
+        if (connection_factory == null) {
+            throw getRuntime().newRuntimeError("@connection_factory not set");
+        }
+        JdbcConnectionFactory connectionFactory;
         try {
-            factory = (JdbcConnectionFactory) JavaEmbedUtils.rubyToJava(
-                    connection_factory.getRuntime(), connection_factory, JdbcConnectionFactory.class);
-        } catch (Exception e) {
-            factory = null;
+            connectionFactory = (JdbcConnectionFactory) 
+                connection_factory.toJava(JdbcConnectionFactory.class);
         }
-        if (factory == null) {
+        catch (Exception e) { // TODO debug this !
+            connectionFactory = null;
+        }
+        if (connectionFactory == null) {
             throw getRuntime().newRuntimeError("@connection_factory not set properly");
         }
-        return factory;
+        return connectionFactory;
     }
 
     private static String[] getTypes(IRubyObject typeArg) {
@@ -880,12 +886,26 @@ public class RubyJdbcConnection extends RubyObject {
         return RubyString.newUnicodeString(runtime, str.toString());
     }
 
-    private IRubyObject setConnection(Connection c) {
-        close(getConnection()); // Close previously open connection if there is one
+    protected final Connection getConnection() {
+        return getConnection(false);
+    }
 
-        IRubyObject rubyconn = c != null ? wrappedConnection(c) : getRuntime().getNil();
-        setInstanceVariable("@connection", rubyconn);
-        dataWrapStruct(c);
+    protected Connection getConnection(boolean error) {
+        final Connection connection = (Connection) dataGetStruct();
+        if ( connection == null && error ) {
+            RubyClass err = getRuntime().getModule("ActiveRecord").getClass("ConnectionNotEstablished");
+            throw new RaiseException(getRuntime(), err, "no connection available", false);
+        }
+        return connection;
+    }
+    
+    private synchronized RubyJdbcConnection setConnection(final Connection connection) {
+        close( getConnection(false) ); // close previously open connection if there is one
+        
+        final IRubyObject rubyConnectionObject = 
+            connection != null ? wrappedConnection(connection) : getRuntime().getNil();
+        setInstanceVariable( "@connection", rubyConnectionObject );
+        dataWrapStruct(connection);
         return this;
     }
 
@@ -1061,18 +1081,21 @@ public class RubyJdbcConnection extends RubyObject {
      * Create a string which represents a sql type usable by Rails from the resultSet column
      * metadata object.
      */
-    protected String typeFromResultSet(ResultSet resultSet) throws SQLException {
-        int precision = intFromResultSet(resultSet, COLUMN_SIZE);
-        int scale = intFromResultSet(resultSet, DECIMAL_DIGITS);
-
-        String type = resultSet.getString(TYPE_NAME);
-        if (precision > 0) {
-            type += "(" + precision;
-            if(scale > 0) type += "," + scale;
-            type += ")";
-        }
+    protected String typeFromResultSet(final ResultSet resultSet) throws SQLException {
+        final int precision = intFromResultSet(resultSet, COLUMN_SIZE);
+        final int scale = intFromResultSet(resultSet, DECIMAL_DIGITS);
 
-        return type;
+        final String type = resultSet.getString(TYPE_NAME);
+        return formatTypeWithPrecisionAndScale(type, precision, scale);
+    }
+
+    protected static String formatTypeWithPrecisionAndScale(final String type, final int precision, final int scale) {
+        if ( precision <= 0 ) return type;
+
+        final StringBuilder typeStr = new StringBuilder().append(type);
+        typeStr.append('(').append(precision); // type += "(" + precision;
+        if ( scale > 0 ) typeStr.append(',').append(scale); // type += "," + scale;
+        return typeStr.append(')').toString(); // type += ")";
     }
 
     private IRubyObject defaultValueFromResultSet(Ruby runtime, ResultSet resultSet)
@@ -1134,21 +1157,20 @@ public class RubyJdbcConnection extends RubyObject {
 
     protected IRubyObject unmarshalResults(ThreadContext context, DatabaseMetaData metadata,
                                            Statement stmt, boolean downCase) throws SQLException {
-        Ruby runtime = context.getRuntime();
-        List<IRubyObject> sets = new ArrayList<IRubyObject>();
-
-        while (true) {
-            sets.add(unmarshalResult(context, metadata, stmt.getResultSet(), downCase));
-            if (!stmt.getMoreResults()) {
-                break;
-            }
+        
+        IRubyObject result = unmarshalResult(context, metadata, stmt.getResultSet(), downCase);
+        
+        if ( ! stmt.getMoreResults() ) return result;
+        
+        final List<IRubyObject> results = new ArrayList<IRubyObject>();
+        results.add(result);
+        do {
+            result = unmarshalResult(context, metadata, stmt.getResultSet(), downCase);
+            results.add(result);
         }
+        while ( stmt.getMoreResults() );
 
-        if (sets.size() > 1) {
-            return runtime.newArray(sets);
-        } else {
-            return sets.get(0);
-        }
+        return context.getRuntime().newArray(results);
     }
 
     /**
@@ -1225,8 +1247,8 @@ public class RubyJdbcConnection extends RubyObject {
         return (RuntimeException) arError;
     }
 
-    private IRubyObject wrappedConnection(Connection c) {
-        return Java.java_to_ruby(this, JavaObject.wrap(getRuntime(), c), Block.NULL_BLOCK);
+    private IRubyObject wrappedConnection(final Connection connection) {
+        return JavaUtil.convertJavaToRuby( getRuntime(), connection );
     }
 
     /**