activerecord-jdbc-adapter 0.6 → 0.7

data/src/java/jdbc_adapter/JdbcConnectionFactory.java

@@ -0,0 +1,36 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2006-2007 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 jdbc_adapter;
+
+import java.sql.Connection;
+
+/**
+ * Interface to be implemented in Ruby for retrieving a new connection
+ *  
+ * @author nicksieger
+ */
+public interface JdbcConnectionFactory {
+    Connection newConnection();
+}

data/src/java/{JDBCDerbySpec.java → jdbc_adapter/JdbcDerbySpec.java}

@@ -1,31 +1,29 @@
 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2007 Ola Bini <ola.bini@gmail.com>
+ * Copyright (c) 2006-2007 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the CPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the CPL, the GPL or the LGPL.
+ * 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 jdbc_adapter;
+
 import org.jruby.Ruby;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
@@ -40,17 +38,18 @@ import org.jruby.RubyNumeric;
 import org.jruby.runtime.Arity;
 import org.jruby.runtime.CallbackFactory;
 import org.jruby.runtime.MethodIndex;
-import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 import org.jruby.util.ByteList;
 
 import java.sql.SQLException;
+import org.jruby.RubyObjectAdapter;
 
-public class JDBCDerbySpec {
-    public static void load(Ruby runtime, RubyModule jdbcSpec) {
+public class JdbcDerbySpec {
+    private static RubyObjectAdapter rubyApi;
+    public static void load(Ruby runtime, RubyModule jdbcSpec, RubyObjectAdapter adapter) {
         RubyModule derby = jdbcSpec.defineModuleUnder("Derby");
-        CallbackFactory cf = runtime.callbackFactory(JDBCDerbySpec.class);
+        CallbackFactory cf = runtime.callbackFactory(JdbcDerbySpec.class);
         derby.defineFastMethod("quote_string",cf.getFastSingletonMethod("quote_string",IRubyObject.class));
         derby.defineFastMethod("quote",cf.getFastOptSingletonMethod("quote"));
         derby.defineFastMethod("_execute",cf.getFastOptSingletonMethod("_execute"));
@@ -59,6 +58,7 @@ public class JDBCDerbySpec {
         derby.defineFastMethod("select_one",cf.getFastOptSingletonMethod("select_one"));
         RubyModule col = derby.defineModuleUnder("Column");
         col.defineFastMethod("type_cast",cf.getFastSingletonMethod("type_cast", IRubyObject.class));
+        rubyApi = adapter;
     }
 
     /*
@@ -67,11 +67,11 @@ public class JDBCDerbySpec {
     public static IRubyObject type_cast(IRubyObject recv, IRubyObject value) {
         Ruby runtime = recv.getRuntime();
 
-        if(value.isNil() || ((value instanceof RubyString) && value.toString().trim().equalsIgnoreCase("null"))) {
+        if (value.isNil() || ((value instanceof RubyString) && value.toString().trim().equalsIgnoreCase("null"))) {
             return runtime.getNil();
         }
 
-        String type = recv.getInstanceVariable("@type").toString();
+        String type = rubyApi.getInstanceVariable(recv,"@type").toString();
 
         switch(type.charAt(0)) {
         case 's': //string
@@ -80,30 +80,30 @@ public class JDBCDerbySpec {
             if(type.equals("text")) {
                 return value;
             } else {
-                return recv.callMethod(runtime.getCurrentContext(), "cast_to_time", value);
+                return rubyApi.callMethod(recv, "cast_to_time", value);
             }
         case 'i': //integer
         case 'p': //primary key
-            if(value.respondsTo("to_i")) {
-                return value.callMethod(runtime.getCurrentContext(), "to_i");
+            if (value.respondsTo("to_i")) {
+                return rubyApi.callMethod(value, "to_i");
             } else {
-                return runtime.newFixnum( value.isTrue() ? 1 : 0 );
+                return runtime.newFixnum(value.isTrue() ? 1 : 0 );
             }
         case 'd': //decimal, datetime, date
             if(type.equals("datetime")) {
-                return recv.callMethod(runtime.getCurrentContext(), "cast_to_date_or_time", value);
+                return rubyApi.callMethod(recv, "cast_to_date_or_time", value);
             } else if(type.equals("date")) {
-                return recv.getMetaClass().callMethod(runtime.getCurrentContext(), "string_to_date", value);
+                return rubyApi.callMethod(recv.getMetaClass(), "string_to_date", value);
             } else {
-                return recv.getMetaClass().callMethod(runtime.getCurrentContext(), "value_to_decimal", value);
+                return rubyApi.callMethod(recv.getMetaClass(), "value_to_decimal", value);
             }
         case 'f': //float
-            return value.callMethod(runtime.getCurrentContext(),"to_f");
+            return rubyApi.callMethod(value,"to_f");
         case 'b': //binary, boolean
-            if(type.equals("binary")) {
-                return recv.callMethod(runtime.getCurrentContext(), "value_to_binary", value);
+            if (type.equals("binary")) {
+                return rubyApi.callMethod(recv, "value_to_binary", value);
             } else {
-                return recv.getMetaClass().callMethod(runtime.getCurrentContext(), "value_to_boolean", value);
+                return rubyApi.callMethod(recv.getMetaClass(), "value_to_boolean", value);
             }
         }
         return value;
@@ -113,26 +113,26 @@ public class JDBCDerbySpec {
         Ruby runtime = recv.getRuntime();
         Arity.checkArgumentCount(runtime, args, 1, 2);
         IRubyObject value = args[0];
-        if(args.length > 1) {
+        if (args.length > 1) {
             IRubyObject col = args[1];
-            IRubyObject type = col.callMethod(runtime.getCurrentContext(),"type");
-            if(value instanceof RubyString) {
-                if(type == runtime.newSymbol("string")) {
+            IRubyObject type = rubyApi.callMethod(col, "type");
+            if (value instanceof RubyString) {
+                if (type == runtime.newSymbol("string")) {
                     return quote_string_with_surround(runtime, "'", (RubyString)value, "'");
-                } else if(type == runtime.newSymbol("text")) {
+                } else if (type == runtime.newSymbol("text")) {
                     return quote_string_with_surround(runtime, "CAST('", (RubyString)value, "' AS CLOB)");
-                } else if(type == runtime.newSymbol("binary")) {
+                } else if (type == runtime.newSymbol("binary")) {
                     return hexquote_string_with_surround(runtime, "CAST('", (RubyString)value, "' AS BLOB)");
                 } else {
                     // column type :integer or other numeric or date version
-                    if(only_digits((RubyString)value)) {
+                    if (only_digits((RubyString)value)) {
                         return value;
                     } else {
                         return super_quote(recv, runtime, value, col);
                     }
                 }
-            } else if((value instanceof RubyFloat) || (value instanceof RubyFixnum) || (value instanceof RubyBignum)) {
-                if(type == runtime.newSymbol("string")) {
+            } else if ((value instanceof RubyFloat) || (value instanceof RubyFixnum) || (value instanceof RubyBignum)) {
+                if (type == runtime.newSymbol("string")) {
                     return quote_string_with_surround(runtime, "'", RubyString.objAsString(value), "'");
                 }
             }
@@ -143,39 +143,40 @@ public class JDBCDerbySpec {
     private final static ByteList NULL = new ByteList("NULL".getBytes());
 
     public static IRubyObject super_quote(IRubyObject recv, Ruby runtime, IRubyObject value, IRubyObject col) {
-        if(value.respondsTo("quoted_id")) {
-            return value.callMethod(runtime.getCurrentContext(), "quoted_id");
+        if (value.respondsTo("quoted_id")) {
+            return rubyApi.callMethod(value, "quoted_id");
         }
         
-        IRubyObject type = (col.isNil()) ? col : col.callMethod(runtime.getCurrentContext(),"type");
-        if(value instanceof RubyString || 
-           value.isKindOf((RubyModule)(((RubyModule)((RubyModule)runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars")))) {
+        IRubyObject type = (col.isNil()) ? col : rubyApi.callMethod(col, "type");
+        RubyModule multibyteChars = (RubyModule) 
+                ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
+        if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars)) {
             RubyString svalue = RubyString.objAsString(value);
-            if(type == runtime.newSymbol("binary") && col.getType().respondsTo("string_to_binary")) {
-                return quote_string_with_surround(runtime, "'", (RubyString)(col.getType().callMethod(runtime.getCurrentContext(), "string_to_binary", svalue)), "'"); 
-            } else if(type == runtime.newSymbol("integer") || type == runtime.newSymbol("float")) {
+            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)), "'"); 
+            } else if (type == runtime.newSymbol("integer") || type == runtime.newSymbol("float")) {
                 return RubyString.objAsString(((type == runtime.newSymbol("integer")) ? 
-                                               svalue.callMethod(runtime.getCurrentContext(), "to_i") : 
-                                               svalue.callMethod(runtime.getCurrentContext(), "to_f")));
+                                               rubyApi.callMethod(svalue, "to_i") : 
+                                               rubyApi.callMethod(svalue, "to_f")));
             } else {
                 return quote_string_with_surround(runtime, "'", svalue, "'"); 
             }
-        } else if(value.isNil()) {
+        } else if (value.isNil()) {
             return runtime.newStringShared(NULL);
-        } else if(value instanceof RubyBoolean) {
+        } else if (value instanceof RubyBoolean) {
             return (value.isTrue() ? 
-                    (type == runtime.newSymbol(":integer")) ? runtime.newString("1") : recv.callMethod(runtime.getCurrentContext(),"quoted_true") :
-                    (type == runtime.newSymbol(":integer")) ? runtime.newString("0") : recv.callMethod(runtime.getCurrentContext(),"quoted_false"));
+                    (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)) {
             return RubyString.objAsString(value);
         } else if(value instanceof RubyBigDecimal) {
-            return value.callMethod(runtime.getCurrentContext(), "to_s", runtime.newString("F"));
-        } else if(value.isKindOf(runtime.getModule("Date"))) {
+            return rubyApi.callMethod(value, "to_s", runtime.newString("F"));
+        } else if (rubyApi.isKindOf(value, runtime.getModule("Date"))) {
             return quote_string_with_surround(runtime, "'", RubyString.objAsString(value), "'"); 
-        } else if(value.isKindOf(runtime.getModule("Time")) || value.isKindOf(runtime.getModule("DateTime"))) {
-            return quote_string_with_surround(runtime, "'", (RubyString)(recv.callMethod(runtime.getCurrentContext(), "quoted_date", value)), "'"); 
+        } else if (rubyApi.isKindOf(value, runtime.getModule("Time")) || rubyApi.isKindOf(value, runtime.getModule("DateTime"))) {
+            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(recv, "quoted_date", value)), "'"); 
         } else {
-            return quote_string_with_surround(runtime, "'", (RubyString)(value.callMethod(runtime.getCurrentContext(), "to_yaml")), "'");
+            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(value, "to_yaml")), "'");
         }
     }
 
@@ -259,55 +260,58 @@ public class JDBCDerbySpec {
     }
 
     public static IRubyObject select_all(IRubyObject recv, IRubyObject[] args) {
-        return recv.callMethod(recv.getRuntime().getCurrentContext(),"execute",args);
+        return rubyApi.callMethod(recv, "execute", args);
     }
 
     public static IRubyObject select_one(IRubyObject recv, IRubyObject[] args) {
-        IRubyObject limit = recv.getInstanceVariable("@limit");
-        if(limit == null || limit.isNil()) {
-            recv.setInstanceVariable("@limit", recv.getRuntime().newFixnum(1));
+        IRubyObject limit = rubyApi.getInstanceVariable(recv, "@limit");
+        if (limit == null || limit.isNil()) {
+            rubyApi.setInstanceVariable(recv, "@limit", recv.getRuntime().newFixnum(1));
         }
         try {
-            return recv.callMethod(recv.getRuntime().getCurrentContext(),"execute",args).callMethod(recv.getRuntime().getCurrentContext(), "first");
+            IRubyObject result = rubyApi.callMethod(recv, "execute", args);
+            return rubyApi.callMethod(result, "first");
         } finally {
-            recv.setInstanceVariable("@limit", recv.getRuntime().getNil());
+            rubyApi.setInstanceVariable(recv, "@limit", recv.getRuntime().getNil());
         }
     }
 
     public static IRubyObject add_limit_offset(IRubyObject recv, IRubyObject sql, IRubyObject options) {
-        recv.setInstanceVariable("@limit", options.callMethod(recv.getRuntime().getCurrentContext(), MethodIndex.AREF, "[]", recv.getRuntime().newSymbol("limit")));
-        return recv.setInstanceVariable("@offset", options.callMethod(recv.getRuntime().getCurrentContext(), MethodIndex.AREF, "[]", recv.getRuntime().newSymbol("offset")));
+        IRubyObject limit = rubyApi.callMethod(options, "[]", recv.getRuntime().newSymbol("limit"));
+        rubyApi.setInstanceVariable(recv, "@limit",limit);
+        IRubyObject offset = rubyApi.callMethod(options, "[]", recv.getRuntime().newSymbol("offset"));
+        return rubyApi.setInstanceVariable(recv, "@offset",offset);
     }
 
     public static IRubyObject _execute(IRubyObject recv, IRubyObject[] args) throws SQLException, java.io.IOException {
         Ruby runtime = recv.getRuntime();
         try {
-            IRubyObject conn = recv.getInstanceVariable("@connection");
+            IRubyObject conn = rubyApi.getInstanceVariable(recv, "@connection");
             String sql = args[0].toString().trim().toLowerCase();
-            if(sql.charAt(0) == '(') {
+            if (sql.charAt(0) == '(') {
                 sql = sql.substring(1).trim();
             }
-            if(sql.startsWith("insert")) {
+            if (sql.startsWith("insert")) {
                 return JdbcAdapterInternalService.execute_insert(conn, args[0]);
-            } else if(sql.startsWith("select") || sql.startsWith("show")) {
-                IRubyObject offset = recv.getInstanceVariable("@offset");
+            } else if (sql.startsWith("select") || sql.startsWith("show")) {
+                IRubyObject offset = rubyApi.getInstanceVariable(recv, "@offset");
                 if(offset == null || offset.isNil()) {
                     offset = RubyFixnum.zero(runtime);
                 }
-                IRubyObject limit = recv.getInstanceVariable("@limit");
+                IRubyObject limit = rubyApi.getInstanceVariable(recv, "@limit");
                 IRubyObject range;
                 IRubyObject max;
-                if(limit == null || limit.isNil() || RubyNumeric.fix2int(limit) == -1) {
+                if (limit == null || limit.isNil() || RubyNumeric.fix2int(limit) == -1) {
                     range = RubyRange.newRange(runtime, offset, runtime.newFixnum(-1), false);
                     max = RubyFixnum.zero(runtime);
                 } else {
-                    IRubyObject v1 = offset.callMethod(runtime.getCurrentContext(), MethodIndex.OP_PLUS, "+", limit);
+                    IRubyObject v1 = rubyApi.callMethod(offset, "+", limit);
                     range = RubyRange.newRange(runtime, offset, v1, true);
-                    max = v1.callMethod(runtime.getCurrentContext(), MethodIndex.OP_PLUS, "+", RubyFixnum.one(runtime));
+                    max = rubyApi.callMethod(v1, "+", RubyFixnum.one(runtime));
                 }
-                IRubyObject ret = JdbcAdapterInternalService.execute_query(conn, new IRubyObject[]{args[0], max}).
-                    callMethod(runtime.getCurrentContext(), MethodIndex.AREF, "[]", range);
-                if(ret.isNil()) {
+                IRubyObject result = JdbcAdapterInternalService.execute_query(conn, new IRubyObject[]{args[0], max});
+                IRubyObject ret = rubyApi.callMethod(result, "[]", range);
+                if (ret.isNil()) {
                     return runtime.newArray();
                 } else {
                     return ret;
@@ -316,8 +320,8 @@ public class JDBCDerbySpec {
                 return JdbcAdapterInternalService.execute_update(conn, args[0]);
             }
         } finally {
-            recv.setInstanceVariable("@limit",runtime.getNil());
-            recv.setInstanceVariable("@offset",runtime.getNil());
+            rubyApi.setInstanceVariable(recv, "@limit", runtime.getNil());
+            rubyApi.setInstanceVariable(recv, "@offset", runtime.getNil());
         }
     }
 }

data/src/java/{JDBCMySQLSpec.java → jdbc_adapter/JdbcMySQLSpec.java}

@@ -1,45 +1,42 @@
 /***** BEGIN LICENSE BLOCK *****
- * Version: CPL 1.0/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Common Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Copyright (C) 2007 Ola Bini <ola.bini@gmail.com>
+ * Copyright (c) 2006-2007 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  * 
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the CPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the CPL, the GPL or the LGPL.
+ * 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 jdbc_adapter;
+
 import org.jruby.Ruby;
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
 
 import org.jruby.runtime.CallbackFactory;
-import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 import org.jruby.util.ByteList;
 
-public class JDBCMySQLSpec {
+public class JdbcMySQLSpec {
     public static void load(Ruby runtime, RubyModule jdbcSpec) {
         RubyModule mysql = jdbcSpec.defineModuleUnder("MySQL");
-        CallbackFactory cf = runtime.callbackFactory(JDBCMySQLSpec.class);
+        CallbackFactory cf = runtime.callbackFactory(JdbcMySQLSpec.class);
         mysql.defineFastMethod("quote_string",cf.getFastSingletonMethod("quote_string",IRubyObject.class));
     }
 

data/src/java/jdbc_adapter/SQLBlock.java

@@ -0,0 +1,18 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package jdbc_adapter;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author nicksieger
+ */
+public interface SQLBlock {
+    IRubyObject call(Connection c) throws SQLException;
+}

data/test/has_many_through.rb

@@ -0,0 +1,72 @@
+class CreateRbac < ActiveRecord::Migration
+  def self.up
+    create_table :role_assignments do |t| 
+      t.column :role_id, :integer
+      t.column :user_id, :integer
+    end
+
+    create_table :roles do |t| 
+      t.column :name, :string
+      t.column :description, :string
+    end 
+
+    create_table :permission_groups do |t|
+      t.column :right_id, :integer
+      t.column :role_id, :integer
+    end 
+
+    create_table :rights do |t| 
+      t.column :name, :string
+      t.column :controller_name, :string
+      t.column :actions, :string
+    end
+  end
+
+  def self.down
+    drop_table :role_assignments
+    drop_table :roles
+    drop_table :permission_groups
+    drop_table :rights
+  end
+end
+
+class Right < ActiveRecord::Base
+  has_many :permission_groups, :dependent => :destroy
+  has_many :roles, :through => :permission_groups
+end
+
+class Role < ActiveRecord::Base
+  has_many :permission_groups, :dependent => :destroy
+  has_many :rights, :through => :permission_groups
+  has_many :role_assignments, :dependent => :destroy
+end
+
+class PermissionGroup < ActiveRecord::Base
+  belongs_to :right
+  belongs_to :role
+end
+
+class RoleAssignment < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :role
+end
+
+module HasManyThroughMethods
+  def setup
+    CreateRbac.up
+  end
+
+  def teardown
+    CreateRbac.down
+  end
+
+  def test_has_many_through
+    role_rights   = Right.create( {:name => "Administrator - Full Access To Roles", :actions => "*", :controller_name => "Admin::RolesController"} )
+    right_rights  = Right.create( {:name => "Administrator - Full Access To Rights", :actions => "*", :controller_name => "Admin::RightsController"} )
+
+    admin_role    = Role.create( {:name => "Administrator", :description => "System defined super user - access to right and role management."} )
+    admin_role.rights << role_rights
+    admin_role.rights << right_rights
+    admin_role.save
+  end
+end