activerecord-jdbc-adapter 0.9.7-java → 1.0.0.beta1-java

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -0,0 +1,33 @@
+# Don't need to load native sqlite3 adapter
+$LOADED_FEATURES << "active_record/connection_adapters/sqlite_adapter.rb"
+$LOADED_FEATURES << "active_record/connection_adapters/sqlite3_adapter.rb"
+
+class ActiveRecord::Base
+  class << self
+    def sqlite3_connection(config)
+      require "arjdbc/sqlite3"
+
+      parse_sqlite3_config!(config)
+
+      config[:url] ||= "jdbc:sqlite:#{config[:database]}"
+      config[:driver] ||= "org.sqlite.JDBC"
+      config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter
+      jdbc_connection(config)
+    end
+
+    def parse_sqlite3_config!(config)
+      config[:database] ||= config[:dbfile]
+
+      # Allow database path relative to RAILS_ROOT, but only if
+      # the database path is not the special path that tells
+      # Sqlite to build a database only in memory.
+      rails_root_defined = defined?(Rails.root) || Object.const_defined?(:RAILS_ROOT)
+      if rails_root_defined && ':memory:' != config[:database]
+        rails_root = defined?(Rails.root) ? Rails.root : RAILS_ROOT
+        config[:database] = File.expand_path(config[:database], rails_root)
+      end
+    end
+
+    alias_method :jdbcsqlite3_connection, :sqlite3_connection
+  end
+end

data/lib/arjdbc/sybase.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/jdbc'
+require 'arjdbc/sybase/adapter.rb'

data/lib/arjdbc/sybase/adapter.rb

@@ -0,0 +1,46 @@
+module ArJdbc
+  module Sybase
+    def add_limit_offset!(sql, options) # :nodoc:
+      @limit = options[:limit]
+      @offset = options[:offset]
+      if use_temp_table?
+        # Use temp table to hack offset with Sybase
+        sql.sub!(/ FROM /i, ' INTO #artemp FROM ')
+      elsif zero_limit?
+        # "SET ROWCOUNT 0" turns off limits, so we havesy
+        # to use a cheap trick.
+        if sql =~ /WHERE/i
+          sql.sub!(/WHERE/i, 'WHERE 1 = 2 AND ')
+        elsif sql =~ /ORDER\s+BY/i
+          sql.sub!(/ORDER\s+BY/i, 'WHERE 1 = 2 ORDER BY')
+        else
+          sql << 'WHERE 1 = 2'
+        end
+      end
+    end
+
+    # If limit is not set at all, we can ignore offset;
+    # if limit *is* set but offset is zero, use normal select
+    # with simple SET ROWCOUNT.  Thus, only use the temp table
+    # if limit is set and offset > 0.
+    def use_temp_table?
+      !@limit.nil? && !@offset.nil? && @offset > 0
+    end
+
+    def zero_limit?
+      !@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
+    end
+
+    def remove_index(table_name, options = {})
+      execute "DROP INDEX #{table_name}.#{index_name(table_name, options)}"
+    end
+  end
+end

data/lib/arjdbc/version.rb

@@ -0,0 +1,8 @@
+module ArJdbc
+  module Version
+    VERSION = "1.0.0.beta1"
+  end
+end
+# Compatibility with older versions of ar-jdbc for other extensions out there
+JdbcAdapter = ArJdbc
+JdbcSpec = ArJdbc

data/lib/jdbc_adapter.rb

@@ -1,27 +1,2 @@
-if defined?(JRUBY_VERSION)
-  begin
-    tried_gem ||= false
-    require 'active_record/version'
-  rescue LoadError
-    raise if tried_gem
-    require 'rubygems'
-    gem 'activerecord'
-    tried_gem = true
-    retry
-  end
-  if ActiveRecord::VERSION::MAJOR < 2
-    if defined?(RAILS_CONNECTION_ADAPTERS)
-      RAILS_CONNECTION_ADAPTERS << %q(jdbc)
-    else
-      RAILS_CONNECTION_ADAPTERS = %w(jdbc)
-    end
-    if ActiveRecord::VERSION::MAJOR == 1 && ActiveRecord::VERSION::MINOR == 14
-      require 'active_record/connection_adapters/jdbc_adapter'
-    end
-  else
-    require 'active_record'
-    require 'active_record/connection_adapters/jdbc_adapter'
-  end
-else
-  warn "ActiveRecord-JDBC is for use with JRuby only"
-end
+warn "DEPRECATED: require 'arjdbc' instead of 'jdbc_adapter'."
+require 'arjdbc'

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,3 @@
-module JdbcAdapter
-  module Version
-    VERSION = "0.9.7"
-  end
-end
+warn "DEPRECATED: require 'arjdbc/version' instead of 'jdbc_adapter/version'."
+require 'arjdbc/version'
+

data/rails_generators/templates/config/initializers/jdbc.rb

@@ -4,4 +4,4 @@
 # This file allows the JDBC drivers to be hooked into ActiveRecord
 # such that you don't have to change anything else in your Rails
 # application.
-require 'jdbc_adapter' if defined?(JRUBY_VERSION)
+require 'arjdbc' if defined?(JRUBY_VERSION)

data/rakelib/compile.rake

@@ -12,12 +12,13 @@ def java_classpath_arg # myriad of ways to discover JRuby classpath
   jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
 end
 
+jar_name = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
+
 desc "Compile the native Java code."
 task :java_compile do
   pkg_classes = File.join(*%w(pkg classes))
-  jar_name = File.join(*%w(lib jdbc_adapter jdbc_adapter_internal.jar))
   mkdir_p pkg_classes
   sh "javac -target 1.5 -source 1.5 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}"
   sh "jar cf #{jar_name} -C #{pkg_classes} ."
 end
-file "lib/jdbc_adapter/jdbc_adapter_internal.jar" => :java_compile
+file jar_name => :java_compile

data/rakelib/package.rake

@@ -1,5 +1,5 @@
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt",
-  "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/jdbc_adapter/jdbc_adapter_internal.jar", "test/**/*.rb",
+  "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/arjdbc/jdbc/adapter_java.jar", "test/**/*.rb",
    "lib/**/*.rake", "src/**/*.java", "rakelib/*.rake", "rails_generators/**/*"]
 
 file "Manifest.txt" => :manifest
@@ -8,12 +8,12 @@ task :manifest do
 end
 Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
 
-require File.dirname(__FILE__) + "/../lib/jdbc_adapter/version"
+require File.dirname(__FILE__) + "/../lib/arjdbc/version"
 begin
   require 'hoe'
   Hoe.plugin :gemcutter
   hoe = Hoe.spec("activerecord-jdbc-adapter") do |p|
-    p.version = JdbcAdapter::Version::VERSION
+    p.version = ArJdbc::Version::VERSION
     p.spec_extras[:platform] = Gem::Platform.new("java")
     p.spec_extras[:files] = MANIFEST
     p.rubyforge_name = "jruby-extras"

data/src/java/{jdbc_adapter/JdbcDerbySpec.java → arjdbc/derby/DerbyModule.java}

@@ -1,7 +1,7 @@
 /***** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2007 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007, 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
@@ -9,10 +9,10 @@
  * 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
@@ -22,33 +22,33 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
 
-package jdbc_adapter;
+package arjdbc.derby;
+
+import java.sql.SQLException;
+
+import arjdbc.jdbc.RubyJdbcConnection;
 
 import org.jruby.Ruby;
-import org.jruby.RubyModule;
-import org.jruby.RubyString;
-import org.jruby.RubyFloat;
-import org.jruby.RubyFixnum;
+import org.jruby.RubyBigDecimal;
 import org.jruby.RubyBignum;
 import org.jruby.RubyBoolean;
-import org.jruby.RubyBigDecimal;
-import org.jruby.RubyRange;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyFloat;
+import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
-
-import org.jruby.runtime.builtin.IRubyObject;
-
-import org.jruby.util.ByteList;
-
-import java.sql.SQLException;
 import org.jruby.RubyObjectAdapter;
+import org.jruby.RubyRange;
+import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 
-public class JdbcDerbySpec {
+public class DerbyModule {
     private static RubyObjectAdapter rubyApi;
-    public static void load(RubyModule jdbcSpec, RubyObjectAdapter adapter) {
-        RubyModule derby = jdbcSpec.defineModuleUnder("Derby");
-        derby.defineAnnotatedMethods(JdbcDerbySpec.class);
+    public static void load(RubyModule arJdbc, RubyObjectAdapter adapter) {
+        RubyModule derby = arJdbc.defineModuleUnder("Derby");
+        derby.defineAnnotatedMethods(DerbyModule.class);
         RubyModule column = derby.defineModuleUnder("Column");
         column.defineAnnotatedMethods(Column.class);
         rubyApi = adapter;
@@ -131,7 +131,7 @@ public class JdbcDerbySpec {
                     return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, value), "'");
                 }
             }
-        } 
+        }
         return super_quote(context, recv, runtime, value, runtime.getNil());
     }
 
@@ -141,25 +141,25 @@ public class JdbcDerbySpec {
         if (value.respondsTo("quoted_id")) {
             return rubyApi.callMethod(value, "quoted_id");
         }
-        
+
         IRubyObject type = (col.isNil()) ? col : rubyApi.callMethod(col, "type");
-        RubyModule multibyteChars = (RubyModule) 
+        RubyModule multibyteChars = (RubyModule)
                 ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
         if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars)) {
             RubyString svalue = RubyString.objAsString(context, value);
             if (type == runtime.newSymbol("binary") && col.getType().respondsTo("string_to_binary")) {
-                return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(col.getType(), "string_to_binary", svalue)), "'"); 
+                return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(col.getType(), "string_to_binary", svalue)), "'");
             } else if (type == runtime.newSymbol("integer") || type == runtime.newSymbol("float")) {
                 return RubyString.objAsString(context, ((type == runtime.newSymbol("integer")) ?
-                                               rubyApi.callMethod(svalue, "to_i") : 
+                                               rubyApi.callMethod(svalue, "to_i") :
                                                rubyApi.callMethod(svalue, "to_f")));
             } else {
-                return quote_string_with_surround(runtime, "'", svalue, "'"); 
+                return quote_string_with_surround(runtime, "'", svalue, "'");
             }
         } else if (value.isNil()) {
             return runtime.newString(NULL);
         } else if (value instanceof RubyBoolean) {
-            return (value.isTrue() ? 
+            return (value.isTrue() ?
                     (type == runtime.newSymbol(":integer")) ? runtime.newString("1") : rubyApi.callMethod(recv, "quoted_true") :
                     (type == runtime.newSymbol(":integer")) ? runtime.newString("0") : rubyApi.callMethod(recv, "quoted_false"));
         } else if((value instanceof RubyFloat) || (value instanceof RubyFixnum) || (value instanceof RubyBignum)) {
@@ -167,7 +167,7 @@ public class JdbcDerbySpec {
         } else if(value instanceof RubyBigDecimal) {
             return rubyApi.callMethod(value, "to_s", runtime.newString("F"));
         } else if (rubyApi.callMethod(value, "acts_like?", runtime.newString("date")).isTrue() || rubyApi.callMethod(value, "acts_like?", runtime.newString("time")).isTrue()) {
-            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(recv, "quoted_date", value)), "'"); 
+            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(recv, "quoted_date", value)), "'");
         } else {
             return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(value, "to_yaml")), "'");
         }
@@ -231,14 +231,14 @@ public class JdbcDerbySpec {
     public static IRubyObject quote_string(IRubyObject recv, IRubyObject string) {
         boolean replacementFound = false;
         ByteList bl = ((RubyString) string).getByteList();
-        
+
         for(int i = bl.begin; i < bl.begin + bl.realSize; i++) {
             switch (bl.bytes[i]) {
             case '\'': break;
             default: continue;
             }
-            
-            // On first replacement allocate a different bytelist so we don't manip original 
+
+            // On first replacement allocate a different bytelist so we don't manip original
             if(!replacementFound) {
                 i-= bl.begin;
                 bl = new ByteList(bl);

data/src/java/{jdbc_adapter/JdbcAdapterInternalService.java → arjdbc/jdbc/AdapterJavaService.java}

@@ -1,6 +1,6 @@
 /*
  **** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2009 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
  *
@@ -24,10 +24,16 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
 
-package jdbc_adapter;
+package arjdbc.jdbc;
 
 import java.io.IOException;
 
+import arjdbc.postgresql.PostgresqlRubyJdbcConnection;
+import arjdbc.mssql.MssqlRubyJdbcConnection;
+import arjdbc.sqlite3.Sqlite3RubyJdbcConnection;
+import arjdbc.mysql.MySQLModule;
+import arjdbc.derby.DerbyModule;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyModule;
@@ -35,19 +41,19 @@ import org.jruby.RubyObjectAdapter;
 import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.runtime.load.BasicLibraryService;
 
-public class JdbcAdapterInternalService implements BasicLibraryService {
+public class AdapterJavaService implements BasicLibraryService {
     private static RubyObjectAdapter rubyApi;
 
     public boolean basicLoad(final Ruby runtime) throws IOException {
         RubyClass jdbcConnection = RubyJdbcConnection.createJdbcConnectionClass(runtime);
-        PostgresRubyJdbcConnection.createPostgresJdbcConnectionClass(runtime, jdbcConnection);
+        PostgresqlRubyJdbcConnection.createPostgresqlJdbcConnectionClass(runtime, jdbcConnection);
         MssqlRubyJdbcConnection.createMssqlJdbcConnectionClass(runtime, jdbcConnection);
         Sqlite3RubyJdbcConnection.createSqlite3JdbcConnectionClass(runtime, jdbcConnection);
-        RubyModule jdbcSpec = runtime.getOrCreateModule("JdbcSpec");
+        RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
 
         rubyApi = JavaEmbedUtils.newObjectAdapter();
-        JdbcMySQLSpec.load(jdbcSpec);
-        JdbcDerbySpec.load(jdbcSpec, rubyApi);
+        MySQLModule.load(arJdbc);
+        DerbyModule.load(arJdbc, rubyApi);
         return true;
     }
 }

data/src/java/{jdbc_adapter → arjdbc/jdbc}/JdbcConnectionFactory.java

@@ -1,7 +1,7 @@
 /***** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2007 Nick Sieger <nick@nicksieger.com>
+ * 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
@@ -9,10 +9,10 @@
  * 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
@@ -22,13 +22,13 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
 
-package jdbc_adapter;
+package arjdbc.jdbc;
 
 import java.sql.Connection;
 
 /**
  * Interface to be implemented in Ruby for retrieving a new connection
- *  
+ *
  * @author nicksieger
  */
 public interface JdbcConnectionFactory {

data/src/java/{jdbc_adapter → arjdbc/jdbc}/RubyJdbcConnection.java

@@ -23,7 +23,7 @@
  * 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 jdbc_adapter;
+package arjdbc.jdbc;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -68,6 +68,7 @@ import org.jruby.javasupport.Java;
 import org.jruby.javasupport.JavaObject;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
+import org.jruby.javasupport.util.RuntimeHelpers;
 
 /**
  * Part of our ActiveRecord::ConnectionAdapters::Connection impl.
@@ -197,15 +198,54 @@ public class RubyJdbcConnection extends RubyObject {
         return setConnection(null);
     }
 
+    @JRubyMethod
+    public IRubyObject execute(final ThreadContext context, final IRubyObject sql) {
+        return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
+            public Object call(Connection c) throws SQLException {
+                Statement stmt = null;
+                String query = rubyApi.convertToRubyString(sql).getUnicodeValue();
+                try {
+                    stmt = c.createStatement();
+                    if (stmt.execute(query)) {
+                        return unmarshalResult(context, c.getMetaData(), stmt.getResultSet(), false);
+                    } else {
+                        IRubyObject key = context.getRuntime().getNil();
+                        if (c.getMetaData().supportsGetGeneratedKeys()) {
+                            key = unmarshal_id_result(context.getRuntime(), stmt.getGeneratedKeys());
+                        }
+                        if (key.isNil()) {
+                            return context.getRuntime().newFixnum(stmt.getUpdateCount());
+                        } else {
+                            return key;
+                        }
+                    }
+                } catch (SQLException sqe) {
+                    if (context.getRuntime().isDebug()) {
+                        System.out.println("Error SQL: " + query);
+                    }
+                    throw sqe;
+                } finally {
+                    close(stmt);
+                }
+            }
+        });
+    }
+
     @JRubyMethod(name = "execute_id_insert", required = 2)
-    public IRubyObject execute_id_insert(ThreadContext context, final IRubyObject sql,
+    public IRubyObject execute_id_insert(final ThreadContext context, final IRubyObject sql,
             final IRubyObject id) throws SQLException {
         return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
             public Object call(Connection c) throws SQLException {
-                PreparedStatement ps = c.prepareStatement(rubyApi.convertToRubyString(sql).getUnicodeValue());
+                String insert = rubyApi.convertToRubyString(sql).getUnicodeValue();
+                PreparedStatement ps = c.prepareStatement(insert);
                 try {
                     ps.setLong(1, RubyNumeric.fix2long(id));
                     ps.executeUpdate();
+                } catch (SQLException sqe) {
+                    if (context.getRuntime().isDebug()) {
+                        System.out.println("Error SQL: " + insert);
+                    }
+                    throw sqe;
                 } finally {
                     close(ps);
                 }
@@ -220,10 +260,16 @@ public class RubyJdbcConnection extends RubyObject {
         return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
             public Object call(Connection c) throws SQLException {
                 Statement stmt = null;
+                String insert = rubyApi.convertToRubyString(sql).getUnicodeValue();
                 try {
                     stmt = c.createStatement();
-                    stmt.executeUpdate(rubyApi.convertToRubyString(sql).getUnicodeValue(), Statement.RETURN_GENERATED_KEYS);
+                    stmt.executeUpdate(insert, Statement.RETURN_GENERATED_KEYS);
                     return unmarshal_id_result(context.getRuntime(), stmt.getGeneratedKeys());
+                } catch (SQLException sqe) {
+                    if (context.getRuntime().isDebug()) {
+                        System.out.println("Error SQL: " + insert);
+                    }
+                    throw sqe;
                 } finally {
                     close(stmt);
                 }
@@ -257,6 +303,11 @@ public class RubyJdbcConnection extends RubyObject {
                     stmt = c.createStatement();
                     stmt.setMaxRows(maxRows);
                     return unmarshalResult(context, metadata, stmt.executeQuery(query), false);
+                } catch (SQLException sqe) {
+                    if (context.getRuntime().isDebug()) {
+                        System.out.println("Error SQL: " + query);
+                    }
+                    throw sqe;
                 } finally {
                     close(stmt);
                 }
@@ -270,9 +321,15 @@ public class RubyJdbcConnection extends RubyObject {
         return (IRubyObject) withConnectionAndRetry(context, new SQLBlock() {
             public Object call(Connection c) throws SQLException {
                 Statement stmt = null;
+                String update = rubyApi.convertToRubyString(sql).getUnicodeValue();
                 try {
                     stmt = c.createStatement();
-                    return context.getRuntime().newFixnum((long)stmt.executeUpdate(rubyApi.convertToRubyString(sql).getUnicodeValue()));
+                    return context.getRuntime().newFixnum((long)stmt.executeUpdate(update));
+                } catch (SQLException sqe) {
+                    if (context.getRuntime().isDebug()) {
+                        System.out.println("Error SQL: " + update);
+                    }
+                    throw sqe;
                 } finally {
                     close(stmt);
                 }
@@ -652,6 +709,14 @@ public class RubyJdbcConnection extends RubyObject {
         return conn;
     }
 
+    protected IRubyObject getAdapter(ThreadContext context) {
+        return callMethod(context, "adapter");
+    }
+
+    protected IRubyObject getJdbcColumnClass(ThreadContext context) {
+        return getAdapter(context).callMethod(context, "jdbc_column_class");
+    }
+
     protected JdbcConnectionFactory getConnectionFactory() throws RaiseException {
         IRubyObject connection_factory = getInstanceVariable("@connection_factory");
         JdbcConnectionFactory factory = null;
@@ -943,6 +1008,9 @@ public class RubyJdbcConnection extends RubyObject {
         if (str.endsWith(" 00:00:00.0")) {
             str = str.substring(0, str.length() - (" 00:00:00.0".length()));
         }
+        if (str.endsWith(".0")) {
+            str = str.substring(0, str.length() - (".0".length()));
+        }
 
         return RubyString.newUnicodeString(runtime, str);
     }
@@ -1005,7 +1073,7 @@ public class RubyJdbcConnection extends RubyObject {
             boolean isOracle = clzName.indexOf("oracle") != -1 || clzName.indexOf("oci") != -1;
 
             RubyHash types = (RubyHash) native_database_types();
-            IRubyObject jdbcCol = getConnectionAdapters(runtime).getConstant("JdbcColumn");
+            IRubyObject jdbcCol = getJdbcColumnClass(context);
 
             while (pkeys.next()) {
                 pkeyNames.add(pkeys.getString(COLUMN_NAME));
@@ -1024,13 +1092,6 @@ public class RubyJdbcConnection extends RubyObject {
                         });
                 columns.add(column);
 
-                IRubyObject tp = (IRubyObject)types.fastARef(column.callMethod(context,"type"));
-                if (tp != null && !tp.isNil() && tp.callMethod(context, "[]", runtime.newSymbol("limit")).isNil()) {
-                    column.callMethod(context, "limit=", runtime.getNil());
-                    if(!column.callMethod(context, "type").equals(runtime.newSymbol("decimal"))) {
-                        column.callMethod(context, "precision=", runtime.getNil());
-                    }
-                }
                 if (pkeyNames.contains(colName)) {
                     column.callMethod(context, "primary=", runtime.getTrue());
                 }
@@ -1089,6 +1150,11 @@ public class RubyJdbcConnection extends RubyObject {
                 while (toWrap.getCause() != null && toWrap.getCause() != toWrap) {
                     toWrap = toWrap.getCause();
                 }
+
+                if (context.getRuntime().isDebug()) {
+                    toWrap.printStackTrace(System.out);
+                }
+
                 i++;
                 if (autoCommit) {
                     if (i == 1) {
@@ -1108,9 +1174,18 @@ public class RubyJdbcConnection extends RubyObject {
         throw wrap(context, toWrap);
     }
 
-    private static RuntimeException wrap(ThreadContext context, Throwable exception) {
-        RubyClass err = context.getRuntime().getModule("ActiveRecord").getClass("ActiveRecordError");
-        return (RuntimeException) new RaiseException(context.getRuntime(), err, exception.getMessage(), false).initCause(exception);
+    protected RuntimeException wrap(ThreadContext context, Throwable exception) {
+        Ruby runtime = context.getRuntime();
+        RaiseException arError = new RaiseException(runtime, runtime.getModule("ActiveRecord").getClass("JDBCError"),
+                                                    exception.getMessage(), true);
+        arError.initCause(exception);
+        if (exception instanceof SQLException) {
+            RuntimeHelpers.invoke(context, arError.getException(),
+                                  "errno=", runtime.newFixnum(((SQLException) exception).getErrorCode()));
+            RuntimeHelpers.invoke(context, arError.getException(),
+                                  "sql_exception=", JavaEmbedUtils.javaToRuby(runtime, exception));
+        }
+        return (RuntimeException) arError;
     }
 
     private IRubyObject wrappedConnection(Connection c) {