LICENSE.txt @@ -20,7 +20,7 @@ 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.4 -source 1.4 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}" + 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 @@ -87,7 +87,7 @@ end MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", - "Rakefile", "LICENSE", "lib/**/*.rb", "lib/jdbc_adapter/jdbc_adapter_internal.jar", "test/**/*.rb", + "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/jdbc_adapter/jdbc_adapter_internal.jar", "test/**/*.rb", "lib/**/*.rake", "src/**/*.java"] file "Manifest.txt" => :manifest Rakefile @@ -1,5 +1,5 @@ module JdbcAdapter module Version - VERSION = "0.7.3" + VERSION = "0.8" end end \ No newline at end of file lib/jdbc_adapter/version.rb @@ -59,13 +59,13 @@ import org.jruby.RubyObjectAdapter; import org.jruby.RubyString; 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.runtime.Arity; import org.jruby.runtime.Block; -import org.jruby.runtime.CallbackFactory; import org.jruby.runtime.ThreadContext; import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.load.BasicLibraryService; @@ -75,43 +75,13 @@ public class JdbcAdapterInternalService implements BasicLibraryService { private static RubyObjectAdapter rubyApi; public boolean basicLoad(final Ruby runtime) throws IOException { - RubyClass cJdbcConn = ((RubyModule)(runtime.getModule("ActiveRecord").getConstant("ConnectionAdapters"))). + ((RubyModule)(runtime.getModule("ActiveRecord").getConstant("ConnectionAdapters"))). defineClassUnder("JdbcConnection",runtime.getObject(),runtime.getObject().getAllocator()); - - CallbackFactory cf = runtime.callbackFactory(JdbcAdapterInternalService.class); - cJdbcConn.defineMethod("unmarshal_result",cf.getSingletonMethod("unmarshal_result", IRubyObject.class)); - cJdbcConn.defineMethod("with_connection_retry_guard",cf.getSingletonMethod("with_connection_retry_guard")); - cJdbcConn.defineFastMethod("connection",cf.getFastSingletonMethod("connection")); - cJdbcConn.defineFastMethod("reconnect!",cf.getFastSingletonMethod("reconnect")); - cJdbcConn.defineFastMethod("disconnect!",cf.getFastSingletonMethod("disconnect")); - cJdbcConn.defineFastMethod("execute_update",cf.getFastSingletonMethod("execute_update", IRubyObject.class)); - cJdbcConn.defineFastMethod("execute_query",cf.getFastOptSingletonMethod("execute_query")); - cJdbcConn.defineFastMethod("execute_insert",cf.getFastSingletonMethod("execute_insert", IRubyObject.class)); - cJdbcConn.defineFastMethod("execute_id_insert",cf.getFastSingletonMethod("execute_id_insert", IRubyObject.class, IRubyObject.class)); - cJdbcConn.defineFastMethod("primary_keys",cf.getFastSingletonMethod("primary_keys", IRubyObject.class)); - cJdbcConn.defineFastMethod("set_native_database_types",cf.getFastSingletonMethod("set_native_database_types")); - cJdbcConn.defineFastMethod("native_database_types",cf.getFastSingletonMethod("native_database_types")); - cJdbcConn.defineFastMethod("begin",cf.getFastSingletonMethod("begin")); - cJdbcConn.defineFastMethod("commit",cf.getFastSingletonMethod("commit")); - cJdbcConn.defineFastMethod("rollback",cf.getFastSingletonMethod("rollback")); - cJdbcConn.defineFastMethod("database_name",cf.getFastSingletonMethod("database_name")); - cJdbcConn.defineFastMethod("columns",cf.getFastOptSingletonMethod("columns_internal")); - cJdbcConn.defineFastMethod("columns_internal",cf.getFastOptSingletonMethod("columns_internal")); - cJdbcConn.defineFastMethod("tables",cf.getFastOptSingletonMethod("tables")); - - cJdbcConn.defineFastMethod("insert_bind",cf.getFastOptSingletonMethod("insert_bind")); - cJdbcConn.defineFastMethod("update_bind",cf.getFastOptSingletonMethod("update_bind")); - - cJdbcConn.defineFastMethod("write_large_object",cf.getFastOptSingletonMethod("write_large_object")); - - cJdbcConn.getMetaClass().defineFastMethod("insert?",cf.getFastSingletonMethod("insert_p", IRubyObject.class)); - cJdbcConn.getMetaClass().defineFastMethod("select?",cf.getFastSingletonMethod("select_p", IRubyObject.class)); - RubyModule jdbcSpec = runtime.getOrCreateModule("JdbcSpec"); rubyApi = JavaEmbedUtils.newObjectAdapter(); - JdbcMySQLSpec.load(runtime, jdbcSpec); - JdbcDerbySpec.load(runtime, jdbcSpec, rubyApi); + JdbcMySQLSpec.load(jdbcSpec); + JdbcDerbySpec.load(jdbcSpec, rubyApi); return true; } @@ -131,6 +101,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return p; } + @JRubyMethod(name = "insert?", required = 1) public static IRubyObject insert_p(IRubyObject recv, IRubyObject _sql) { ByteList bl = rubyApi.convertToRubyString(_sql).getByteList(); @@ -169,6 +140,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return recv.getRuntime().getFalse(); } + @JRubyMethod(name = "select?", required = 1) public static IRubyObject select_p(IRubyObject recv, IRubyObject _sql) { ByteList bl = rubyApi.convertToRubyString(_sql).getByteList(); @@ -224,6 +196,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return recv.getRuntime().getFalse(); } + @JRubyMethod(name = "connection") public static IRubyObject connection(IRubyObject recv) { Connection c = getConnection(recv); if (c == null) { @@ -232,16 +205,19 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return rubyApi.getInstanceVariable(recv, "@connection"); } + @JRubyMethod(name = "disconnect") public static IRubyObject disconnect(IRubyObject recv) { setConnection(recv, null); return recv; } + @JRubyMethod(name = "reconnect") public static IRubyObject reconnect(IRubyObject recv) { setConnection(recv, getConnectionFactory(recv).newConnection()); return recv; } + @JRubyMethod(name = "with_connection_retry_guard", frame = true) public static IRubyObject with_connection_retry_guard(final IRubyObject recv, final Block block) { return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { @@ -322,6 +298,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { }; } + @JRubyMethod(name = "tables", rest = true) public static IRubyObject tables(final IRubyObject recv, IRubyObject[] args) { final Ruby runtime = recv.getRuntime(); final String catalog = getCatalog(args); @@ -370,10 +347,12 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return types; } + @JRubyMethod(name = "native_database_types") public static IRubyObject native_database_types(IRubyObject recv) { return rubyApi.getInstanceVariable(recv, "@tps"); } + @JRubyMethod(name = "set_native_database_types") public static IRubyObject set_native_database_types(IRubyObject recv) throws SQLException, IOException { Ruby runtime = recv.getRuntime(); IRubyObject types = unmarshal_result_downcase(recv, getConnection(recv).getMetaData().getTypeInfo()); @@ -383,6 +362,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return runtime.getNil(); } + @JRubyMethod(name = "database_name") public static IRubyObject database_name(IRubyObject recv) throws SQLException { String name = getConnection(recv).getCatalog(); if(null == name) { @@ -394,11 +374,13 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return recv.getRuntime().newString(name); } + @JRubyMethod(name = "begin") public static IRubyObject begin(IRubyObject recv) throws SQLException { getConnection(recv).setAutoCommit(false); return recv.getRuntime().getNil(); } + @JRubyMethod(name = "commit") public static IRubyObject commit(IRubyObject recv) throws SQLException { try { getConnection(recv).commit(); @@ -408,6 +390,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { } } + @JRubyMethod(name = "rollback") public static IRubyObject rollback(IRubyObject recv) throws SQLException { try { getConnection(recv).rollback(); @@ -417,6 +400,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { } } + @JRubyMethod(name = {"columns", "columns_internal"}) public static IRubyObject columns_internal(final IRubyObject recv, final IRubyObject[] args) throws SQLException, IOException { return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { @@ -548,6 +532,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { } } + @JRubyMethod(name = "primary_keys", required = 1) public static IRubyObject primary_keys(final IRubyObject recv, final IRubyObject _table_name) throws SQLException { return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { @@ -579,6 +564,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { }); } + @JRubyMethod(name = "execute_id_insert", required = 2) public static IRubyObject execute_id_insert(IRubyObject recv, final IRubyObject sql, final IRubyObject id) throws SQLException { return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { @@ -594,6 +580,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { }); } + @JRubyMethod(name = "execute_update", required = 1) public static IRubyObject execute_update(final IRubyObject recv, final IRubyObject sql) throws SQLException { return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { @@ -613,6 +600,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { }); } + @JRubyMethod(name = "execute_query", rest = true) public static IRubyObject execute_query(final IRubyObject recv, IRubyObject[] args) throws SQLException, IOException { final IRubyObject sql = args[0]; final int maxrows; @@ -642,6 +630,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { }); } + @JRubyMethod(name = "execute_insert", required = 1) public static IRubyObject execute_insert(final IRubyObject recv, final IRubyObject sql) throws SQLException { return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { @@ -734,6 +723,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { return runtime.newArray(results); } + @JRubyMethod(name = "unmarshal_result", required = 1) public static IRubyObject unmarshal_result(IRubyObject recv, IRubyObject resultset, Block row_filter) throws SQLException, IOException { Ruby runtime = recv.getRuntime(); ResultSet rs = intoResultSet(resultset); @@ -896,7 +886,8 @@ public class JdbcAdapterInternalService implements BasicLibraryService { private final static DateFormat FORMAT = new SimpleDateFormat("%y-%M-%d %H:%m:%s"); - private static void setValue(PreparedStatement ps, int index, Ruby runtime, IRubyObject value, IRubyObject type) throws SQLException { + private static void setValue(PreparedStatement ps, int index, Ruby runtime, ThreadContext context, + IRubyObject value, IRubyObject type) throws SQLException { final int tp = getTypeValueFor(runtime, type); if(value.isNil()) { ps.setNull(index, tp); @@ -906,7 +897,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { switch(tp) { case Types.VARCHAR: case Types.CLOB: - ps.setString(index, RubyString.objAsString(value).toString()); + ps.setString(index, RubyString.objAsString(context, value).toString()); break; case Types.INTEGER: ps.setLong(index, RubyNumeric.fix2long(value)); @@ -919,10 +910,10 @@ public class JdbcAdapterInternalService implements BasicLibraryService { case Types.DATE: if(!(value instanceof RubyTime)) { try { - Date dd = FORMAT.parse(RubyString.objAsString(value).toString()); + Date dd = FORMAT.parse(RubyString.objAsString(context, value).toString()); ps.setTimestamp(index, new java.sql.Timestamp(dd.getTime()), Calendar.getInstance()); } catch(Exception e) { - ps.setString(index, RubyString.objAsString(value).toString()); + ps.setString(index, RubyString.objAsString(context, value).toString()); } } else { RubyTime rubyTime = (RubyTime) value; @@ -943,27 +934,28 @@ public class JdbcAdapterInternalService implements BasicLibraryService { } } - private static void setValuesOnPS(PreparedStatement ps, Ruby runtime, IRubyObject values, IRubyObject types) throws SQLException { + private static void setValuesOnPS(PreparedStatement ps, Ruby runtime, ThreadContext context, + IRubyObject values, IRubyObject types) throws SQLException { RubyArray vals = (RubyArray)values; RubyArray tps = (RubyArray)types; for(int i=0, j=vals.getLength(); i<j; i++) { - setValue(ps, i+1, runtime, vals.eltInternal(i), tps.eltInternal(i)); + setValue(ps, i+1, runtime, context, vals.eltInternal(i), tps.eltInternal(i)); } } /* * sql, values, types, name = nil, pk = nil, id_value = nil, sequence_name = nil */ - public static IRubyObject insert_bind(IRubyObject recv, final IRubyObject[] args) throws SQLException { + @JRubyMethod(name = "insert_bind", required = 3, rest = true) + public static IRubyObject insert_bind(final ThreadContext context, IRubyObject recv, final IRubyObject[] args) throws SQLException { final Ruby runtime = recv.getRuntime(); - Arity.checkArgumentCount(runtime, args, 3, 7); return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { PreparedStatement ps = null; try { ps = c.prepareStatement(rubyApi.convertToRubyString(args[0]).toString(), Statement.RETURN_GENERATED_KEYS); - setValuesOnPS(ps, runtime, args[1], args[2]); + setValuesOnPS(ps, runtime, context, args[1], args[2]); ps.executeUpdate(); return unmarshal_id_result(runtime, ps.getGeneratedKeys()); } finally { @@ -979,7 +971,8 @@ public class JdbcAdapterInternalService implements BasicLibraryService { /* * sql, values, types, name = nil */ - public static IRubyObject update_bind(IRubyObject recv, final IRubyObject[] args) throws SQLException { + @JRubyMethod(name = "update_bind", required = 3, rest = true) + public static IRubyObject update_bind(final ThreadContext context, IRubyObject recv, final IRubyObject[] args) throws SQLException { final Ruby runtime = recv.getRuntime(); Arity.checkArgumentCount(runtime, args, 3, 4); return withConnectionAndRetry(recv, new SQLBlock() { @@ -987,7 +980,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService { PreparedStatement ps = null; try { ps = c.prepareStatement(rubyApi.convertToRubyString(args[0]).toString()); - setValuesOnPS(ps, runtime, args[1], args[2]); + setValuesOnPS(ps, runtime, context, args[1], args[2]); ps.executeUpdate(); } finally { try { @@ -1003,10 +996,10 @@ public class JdbcAdapterInternalService implements BasicLibraryService { /* * (is binary?, colname, tablename, primary key, id, value) */ + @JRubyMethod(name = "write_large_object", required = 6) public static IRubyObject write_large_object(IRubyObject recv, final IRubyObject[] args) throws SQLException, IOException { final Ruby runtime = recv.getRuntime(); - Arity.checkArgumentCount(runtime, args, 6, 6); return withConnectionAndRetry(recv, new SQLBlock() { public IRubyObject call(Connection c) throws SQLException { String sql = "UPDATE " + rubyApi.convertToRubyString(args[2]) src/java/jdbc_adapter/JdbcAdapterInternalService.java @@ -35,35 +35,27 @@ import org.jruby.RubyBigDecimal; import org.jruby.RubyRange; import org.jruby.RubyNumeric; -import org.jruby.runtime.Arity; -import org.jruby.runtime.CallbackFactory; -import org.jruby.runtime.MethodIndex; import org.jruby.runtime.builtin.IRubyObject; import org.jruby.util.ByteList; import java.sql.SQLException; import org.jruby.RubyObjectAdapter; +import org.jruby.anno.JRubyMethod; +import org.jruby.runtime.ThreadContext; public class JdbcDerbySpec { private static RubyObjectAdapter rubyApi; - public static void load(Ruby runtime, RubyModule jdbcSpec, RubyObjectAdapter adapter) { + public static void load(RubyModule jdbcSpec, RubyObjectAdapter adapter) { RubyModule derby = jdbcSpec.defineModuleUnder("Derby"); - 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")); - derby.defineFastMethod("add_limit_offset!",cf.getFastSingletonMethod("add_limit_offset", IRubyObject.class, IRubyObject.class)); - derby.defineFastMethod("select_all",cf.getFastOptSingletonMethod("select_all")); - derby.defineFastMethod("select_one",cf.getFastOptSingletonMethod("select_one")); - RubyModule col = derby.defineModuleUnder("Column"); - col.defineFastMethod("type_cast",cf.getFastSingletonMethod("type_cast", IRubyObject.class)); + derby.defineModuleUnder("Column"); rubyApi = adapter; } /* * JdbcSpec::Derby::Column.type_cast(value) */ + @JRubyMethod(name = "type_cast", required = 1) public static IRubyObject type_cast(IRubyObject recv, IRubyObject value) { Ruby runtime = recv.getRuntime(); @@ -109,9 +101,9 @@ public class JdbcDerbySpec { return value; } - public static IRubyObject quote(IRubyObject recv, IRubyObject[] args) { + @JRubyMethod(name = "quote", required = 1, optional = 1) + public static IRubyObject quote(ThreadContext context, IRubyObject recv, IRubyObject[] args) { Ruby runtime = recv.getRuntime(); - Arity.checkArgumentCount(runtime, args, 1, 2); IRubyObject value = args[0]; if (args.length > 1) { IRubyObject col = args[1]; @@ -128,21 +120,21 @@ public class JdbcDerbySpec { if (only_digits((RubyString)value)) { return value; } else { - return super_quote(recv, runtime, value, col); + return super_quote(context, recv, runtime, value, col); } } } 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), "'"); + return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, value), "'"); } } } - return super_quote(recv, runtime, value, runtime.getNil()); + return super_quote(context, recv, runtime, value, runtime.getNil()); } private final static ByteList NULL = new ByteList("NULL".getBytes()); - public static IRubyObject super_quote(IRubyObject recv, Ruby runtime, IRubyObject value, IRubyObject col) { + public static IRubyObject super_quote(ThreadContext context, IRubyObject recv, Ruby runtime, IRubyObject value, IRubyObject col) { if (value.respondsTo("quoted_id")) { return rubyApi.callMethod(value, "quoted_id"); } @@ -151,11 +143,11 @@ public class JdbcDerbySpec { 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); + 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)), "'"); } else if (type == runtime.newSymbol("integer") || type == runtime.newSymbol("float")) { - return RubyString.objAsString(((type == runtime.newSymbol("integer")) ? + return RubyString.objAsString(context, ((type == runtime.newSymbol("integer")) ? rubyApi.callMethod(svalue, "to_i") : rubyApi.callMethod(svalue, "to_f"))); } else { @@ -168,11 +160,11 @@ public class JdbcDerbySpec { (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); + return RubyString.objAsString(context, value); } else if(value instanceof RubyBigDecimal) { 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), "'"); + return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, 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 { @@ -232,6 +224,7 @@ public class JdbcDerbySpec { return true; } + @JRubyMethod(name = "quote_string", required = 1) public static IRubyObject quote_string(IRubyObject recv, IRubyObject string) { boolean replacementFound = false; ByteList bl = ((RubyString) string).getByteList(); @@ -259,10 +252,12 @@ public class JdbcDerbySpec { } } + @JRubyMethod(name = "select_all", rest = true) public static IRubyObject select_all(IRubyObject recv, IRubyObject[] args) { return rubyApi.callMethod(recv, "execute", args); } + @JRubyMethod(name = "select_one", rest = true) public static IRubyObject select_one(IRubyObject recv, IRubyObject[] args) { IRubyObject limit = rubyApi.getInstanceVariable(recv, "@limit"); if (limit == null || limit.isNil()) { @@ -276,6 +271,7 @@ public class JdbcDerbySpec { } } + @JRubyMethod(name = "add_limit_offset", required = 2) public static IRubyObject add_limit_offset(IRubyObject recv, IRubyObject sql, IRubyObject options) { IRubyObject limit = rubyApi.callMethod(options, "[]", recv.getRuntime().newSymbol("limit")); rubyApi.setInstanceVariable(recv, "@limit",limit); @@ -283,7 +279,8 @@ public class JdbcDerbySpec { return rubyApi.setInstanceVariable(recv, "@offset",offset); } - public static IRubyObject _execute(IRubyObject recv, IRubyObject[] args) throws SQLException, java.io.IOException { + @JRubyMethod(name = "_execute", required = 1, optional = 1) + public static IRubyObject _execute(ThreadContext context, IRubyObject recv, IRubyObject[] args) throws SQLException, java.io.IOException { Ruby runtime = recv.getRuntime(); try { IRubyObject conn = rubyApi.getInstanceVariable(recv, "@connection"); @@ -302,11 +299,11 @@ public class JdbcDerbySpec { IRubyObject range; IRubyObject max; if (limit == null || limit.isNil() || RubyNumeric.fix2int(limit) == -1) { - range = RubyRange.newRange(runtime, offset, runtime.newFixnum(-1), false); + range = RubyRange.newRange(runtime, context, offset, runtime.newFixnum(-1), false); max = RubyFixnum.zero(runtime); } else { IRubyObject v1 = rubyApi.callMethod(offset, "+", limit); - range = RubyRange.newRange(runtime, offset, v1, true); + range = RubyRange.newRange(runtime, context, offset, v1, true); max = rubyApi.callMethod(v1, "+", RubyFixnum.one(runtime)); } IRubyObject result = JdbcAdapterInternalService.execute_query(conn, new IRubyObject[]{args[0], max}); src/java/jdbc_adapter/JdbcDerbySpec.java @@ -28,16 +28,14 @@ import org.jruby.Ruby; import org.jruby.RubyModule; import org.jruby.RubyString; -import org.jruby.runtime.CallbackFactory; +import org.jruby.anno.JRubyMethod; import org.jruby.runtime.builtin.IRubyObject; import org.jruby.util.ByteList; public class JdbcMySQLSpec { - public static void load(Ruby runtime, RubyModule jdbcSpec) { - RubyModule mysql = jdbcSpec.defineModuleUnder("MySQL"); - CallbackFactory cf = runtime.callbackFactory(JdbcMySQLSpec.class); - mysql.defineFastMethod("quote_string",cf.getFastSingletonMethod("quote_string",IRubyObject.class)); + public static void load(RubyModule jdbcSpec) { + jdbcSpec.defineModuleUnder("MySQL"); } private final static ByteList ZERO = new ByteList(new byte[]{'\\','0'}); @@ -48,6 +46,7 @@ public class JdbcMySQLSpec { private final static ByteList SINGLE = new ByteList(new byte[]{'\\','\''}); private final static ByteList ESCAPE = new ByteList(new byte[]{'\\','\\'}); + @JRubyMethod(name = "quote_string", required = 1) public static IRubyObject quote_string(IRubyObject recv, IRubyObject string) { ByteList bl = ((RubyString) string).getByteList(); ByteList blNew = new ByteList(); src/java/jdbc_adapter/JdbcMySQLSpec.java LICENSE pom.xml 0804f2341200333ab23c40eb20f33aac54455b21 nicksieger nicksieger@8ba958d5-0c1a-0410-94a6-a65dfc1b28a6 http://github.com/nicksieger/activerecord-jdbc-adapter/commit/83b4201ef0cec1f7ade3858cbe21c9fc6d649bd5 83b4201ef0cec1f7ade3858cbe21c9fc6d649bd5 2008-03-07T21:15:12-08:00 2008-03-07T21:15:12-08:00 - Moving to annotation-based method definition - Catching up w/ thread context change - Bumping version up to 0.8 git-svn-id: svn+ssh://rubyforge.org/var/svn/jruby-extras/trunk/activerecord-jdbc@931 8ba958d5-0c1a-0410-94a6-a65dfc1b28a6 5aae98136e84f6df45a78f9c2bf153261753d966 nicksieger nicksieger@8ba958d5-0c1a-0410-94a6-a65dfc1b28a6