kb-activerecord-jdbc-adapter 0.9.7.1-java → 1.0.0.beta1-java

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) {

data/src/java/arjdbc/jdbc/SQLBlock.java

@@ -0,0 +1,48 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * 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>
+ *
+ * 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.jdbc;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ *
+ * @author nicksieger
+ */
+public abstract class SQLBlock {
+    abstract Object call(Connection c) throws SQLException;
+
+    public void close(Statement statement) {
+        RubyJdbcConnection.close(statement);
+    }
+
+    public void close(ResultSet resultSet) {
+        RubyJdbcConnection.close(resultSet);
+    }
+}

data/src/java/{jdbc_adapter → arjdbc/mssql}/MssqlRubyJdbcConnection.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>
  *
@@ -23,11 +23,14 @@
  * 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.mssql;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.runtime.ObjectAllocator;

data/src/java/{jdbc_adapter/JdbcMySQLSpec.java → arjdbc/mysql/MySQLModule.java}

@@ -1,7 +1,7 @@
 /***** 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>
- * 
+ *
  * 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,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
 
-package jdbc_adapter;
+package arjdbc.mysql;
 
 import java.sql.Connection;
 
@@ -35,10 +35,10 @@ import org.jruby.runtime.builtin.IRubyObject;
 
 import org.jruby.util.ByteList;
 
-public class JdbcMySQLSpec {
-    public static void load(RubyModule jdbcSpec) {
-        RubyModule mysql = jdbcSpec.defineModuleUnder("MySQL");
-        mysql.defineAnnotatedMethods(JdbcMySQLSpec.class);
+public class MySQLModule {
+    public static void load(RubyModule arJdbc) {
+        RubyModule mysql = arJdbc.defineModuleUnder("MySQL");
+        mysql.defineAnnotatedMethods(MySQLModule.class);
     }
 
     private final static byte BACKQUOTE = '`';
@@ -56,9 +56,9 @@ public class JdbcMySQLSpec {
     public static IRubyObject quote_string(ThreadContext context, IRubyObject recv, IRubyObject string) {
         ByteList bytes = ((RubyString) string).getByteList();
         ByteList newBytes = new ByteList();
-        
+
         newBytes.append(bytes);
-        
+
         for(int i = newBytes.begin; i < newBytes.begin + newBytes.realSize; i++) {
             byte[] rep = null;
             switch (newBytes.bytes[i]) {
@@ -94,7 +94,7 @@ public class JdbcMySQLSpec {
 
         return context.getRuntime().newString(newBytes);
     }
-    
+
     @JRubyMethod(name = "quote_table_name", frame=false)
     public static IRubyObject quote_table_name(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         ByteList bytes = arg.asString().getByteList();

data/src/java/{jdbc_adapter/PostgresRubyJdbcConnection.java → arjdbc/postgresql/PostgresqlRubyJdbcConnection.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>
  *
@@ -23,7 +23,9 @@
  * 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.postgresql;
+
+import arjdbc.jdbc.RubyJdbcConnection;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -34,22 +36,22 @@ import org.jruby.runtime.builtin.IRubyObject;
  *
  * @author enebo
  */
-public class PostgresRubyJdbcConnection extends RubyJdbcConnection {
-    protected PostgresRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+public class PostgresqlRubyJdbcConnection extends RubyJdbcConnection {
+    protected PostgresqlRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
-    public static RubyClass createPostgresJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+    public static RubyClass createPostgresqlJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
         RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("PostgresJdbcConnection",
-                jdbcConnection, POSTGRES_JDBCCONNECTION_ALLOCATOR);
-        clazz.defineAnnotatedMethods(PostgresRubyJdbcConnection.class);
+                jdbcConnection, POSTGRESQL_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(PostgresqlRubyJdbcConnection.class);
 
         return clazz;
     }
 
-    private static ObjectAllocator POSTGRES_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+    private static ObjectAllocator POSTGRESQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new PostgresRubyJdbcConnection(runtime, klass);
+            return new PostgresqlRubyJdbcConnection(runtime, klass);
         }
     };
 }

data/src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java

@@ -0,0 +1,64 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * 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>
+ *
+ * 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.sqlite3;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author enebo
+ */
+public class Sqlite3RubyJdbcConnection extends RubyJdbcConnection {
+    protected Sqlite3RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createSqlite3JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("Sqlite3JdbcConnection",
+                jdbcConnection, SQLITE3_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(Sqlite3RubyJdbcConnection.class);
+
+        return clazz;
+    }
+
+    private static ObjectAllocator SQLITE3_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new Sqlite3RubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    @Override
+    protected IRubyObject tables(ThreadContext context, String catalog, String schemaPattern, String tablePattern, String[] types) {
+        return (IRubyObject) withConnectionAndRetry(context, tableLookupBlock(context.getRuntime(), catalog, schemaPattern, tablePattern, types, true));
+    }
+}

data/test/abstract_db_create.rb

@@ -9,6 +9,9 @@ module Rails
       @config ||= Object.new
     end
   end
+  def self.application
+    Rails::Application
+  end
 end
 
 module AbstractDbCreate
@@ -22,7 +25,7 @@ module AbstractDbCreate
     setup_rails
     set_rails_constant("env", "unittest")
     set_rails_constant("root", ".")
-    load File.dirname(__FILE__) + '/../lib/jdbc_adapter/jdbc.rake' if jruby?
+    load File.dirname(__FILE__) + '/../lib/arjdbc/jdbc/jdbc.rake' if jruby?
     task :environment do
       ActiveRecord::Base.configurations = configurations
     end

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -1,6 +1,6 @@
 require 'java'
 require 'models/data_types'
-require 'active_record/connection_adapters/jdbc_adapter'
+require 'arjdbc'
 require 'db/derby'
 require 'test/unit'
 

data/test/db/derby.rb

@@ -1,14 +1,12 @@
-require 'logger'
-
-config = {
-  :adapter => 'derby',
-  :database => "derby-testdb"
-}
-
-ActiveRecord::Base.establish_connection(config)
-
-at_exit {  
-  # Clean up derby files
-  require 'fileutils'
-  FileUtils.rm_rf('derby-testdb')
-}
+config = {
+  :adapter => 'derby',
+  :database => "derby-testdb"
+}
+
+ActiveRecord::Base.establish_connection(config)
+
+at_exit {
+  # Clean up derby files
+  require 'fileutils'
+  FileUtils.rm_rf('derby-testdb')
+}

data/test/db/hsqldb.rb

@@ -7,6 +7,7 @@ ActiveRecord::Base.establish_connection(config)
 
 at_exit {
   # Clean up hsqldb when done
-  Dir['test.db*'].each {|f| File.delete(f)}
-  File.delete('hsqldb-testdb.log') rescue nil #can't delete on windows
+  require "fileutils"
+  Dir['test.db*'].each {|f| FileUtils.rm_rf(f)}
+  FileUtils.rm_rf('hsqldb-testdb.log') rescue nil #can't delete on windows
 }

data/test/db/jndi_config.rb

@@ -1,12 +1,12 @@
 require 'fileutils'
-require 'active_record/connection_adapters/jdbc_adapter'
+require 'arjdbc'
 
 System = java.lang.System
 Context = javax.naming.Context
 InitialContext = javax.naming.InitialContext
 Reference = javax.naming.Reference
 StringRefAddr = javax.naming.StringRefAddr
-  
+
 System.set_property(Context::INITIAL_CONTEXT_FACTORY,
                     'com.sun.jndi.fscontext.RefFSContextFactory')
 project_path = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -18,9 +18,9 @@ System.set_property(Context::PROVIDER_URL, "file://#{jndi_dir}")
 derby_ref = Reference.new('javax.sql.DataSource',
                           'org.apache.commons.dbcp.BasicDataSourceFactory',
                           nil)
-derby_ref.add StringRefAddr.new('driverClassName', 
+derby_ref.add StringRefAddr.new('driverClassName',
                                 'org.apache.derby.jdbc.EmbeddedDriver')
-derby_ref.add StringRefAddr.new('url', 
+derby_ref.add StringRefAddr.new('url',
                                 'jdbc:derby:derby-testdb;create=true')
 derby_ref.add StringRefAddr.new('username', 'sa')
 derby_ref.add StringRefAddr.new('password', '')

data/test/db/sqlite3.rb

@@ -1,10 +1,6 @@
-require 'jdbc/sqlite3' if jruby?
-
 config = {
-  :adapter => jruby? ? 'jdbcsqlite3' : 'sqlite3', 
-  :dbfile  => 'test.sqlite3.db'
-#  :url => 'jdbc:sqlite:test.sqlite3.db',
-#  :driver => 'org.sqlite.JDBC'
+  :adapter => 'sqlite3',
+  :database  => 'test.sqlite3.db'
 }
 
 ActiveRecord::Base.establish_connection(config)