drivers/derby/lib/derby-10.5.3.0.jar
@@ -6,6 +6,8 @@
same thing as recreate_database)
- Sqlite3 and MSSQL fixes (Jean-Dominique Morani)
- JRUBY-3512: Treat LONGVARCHAR as a CLOB for Mssql
+- JRUBY-3624: Upgrade Derby to 10.5.3.0 and add native limit/offset
+ support (Christopher Saunders)
== 0.9.1
History.txt
@@ -1,6 +1,6 @@
module Jdbc
module Derby
- VERSION = "10.4.2.0"
+ VERSION = "10.5.3.0"
end
end
drivers/derby/lib/jdbc/derby.rb
@@ -400,6 +400,16 @@ module ::JdbcSpec
'0'
end
+ def add_limit_offset!(sql, options) #:nodoc:
+ if options[:offset]
+ sql << " OFFSET #{options[:offset]} ROWS"
+ end
+ if options[:limit]
+ #ROWS/ROW and FIRST/NEXT mean the same
+ sql << " FETCH FIRST #{options[:limit]} ROWS ONLY"
+ end
+ end
+
private
# Derby appears to define schemas using the username
def derby_schema
lib/jdbc_adapter/jdbc_derby.rb
@@ -274,55 +274,20 @@ 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);
- IRubyObject offset = rubyApi.callMethod(options, "[]", recv.getRuntime().newSymbol("offset"));
- return rubyApi.setInstanceVariable(recv, "@offset",offset);
- }
-
@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 {
- // TODO: Ouch....this looks fragile
- RubyJdbcConnection conn = (RubyJdbcConnection) rubyApi.getInstanceVariable(recv, "@connection");
- String sql = args[0].toString().trim().toLowerCase();
- if (sql.charAt(0) == '(') {
- sql = sql.substring(1).trim();
- }
- if (sql.startsWith("insert")) {
- return conn.execute_insert(context, args[0]);
- } 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 = rubyApi.getInstanceVariable(recv, "@limit");
- IRubyObject range;
- IRubyObject max;
- if (limit == null || limit.isNil() || RubyNumeric.fix2int(limit) == -1) {
- 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, context, offset, v1, true);
- max = rubyApi.callMethod(v1, "+", RubyFixnum.one(runtime));
- }
- IRubyObject result = conn.execute_query(context, args[0], max);
- IRubyObject ret = rubyApi.callMethod(result, "[]", range);
- if (ret.isNil()) {
- return runtime.newArray();
- } else {
- return ret;
- }
- } else {
- return conn.execute_update(context, args[0]);
- }
- } finally {
- rubyApi.setInstanceVariable(recv, "@limit", runtime.getNil());
- rubyApi.setInstanceVariable(recv, "@offset", runtime.getNil());
+ RubyJdbcConnection conn = (RubyJdbcConnection) rubyApi.getInstanceVariable(recv, "@connection");
+ String sql = args[0].toString().trim().toLowerCase();
+ if (sql.charAt(0) == '(') {
+ sql = sql.substring(1).trim();
+ }
+ if (sql.startsWith("insert")) {
+ return conn.execute_insert(context, args[0]);
+ } else if (sql.startsWith("select") || sql.startsWith("show")) {
+ return conn.execute_query(context, args[0]);
+ } else {
+ return conn.execute_update(context, args[0]);
}
}
}
src/java/jdbc_adapter/JdbcDerbySpec.java
drivers/derby/lib/derby-10.4.2.0.jar
6a2f433ce9599d7f23e0f6ceee9835fbef912547
Nick Sieger
nick@nicksieger.com
http://github.com/nicksieger/activerecord-jdbc-adapter/commit/7c5895c39c8cd280306eb7a30ff26855e125075a
7c5895c39c8cd280306eb7a30ff26855e125075a
2009-09-23T19:29:19-07:00
2009-09-23T19:29:19-07:00
JRUBY-3624: Upgrade Derby to 10.5.3.0 and add native limit/offset support (Christopher Saunders)
6a2a64a4d4d9a19d21844727b4b21d46eb4f377a
Nick Sieger
nick@nicksieger.com