activerecord-jdbc-adapter 1.0.3-java → 50.1-java

data/src/java/arjdbc/derby/DerbyModule.java

@@ -1,5 +1,6 @@
 /***** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2007, 2010 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
+ * Copyright (c) 2006-2011 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
@@ -24,20 +25,12 @@
 
 package arjdbc.derby;
 
-import java.sql.SQLException;
-
-import arjdbc.jdbc.RubyJdbcConnection;
+import static arjdbc.util.QuotingUtils.BYTES_0;
+import static arjdbc.util.QuotingUtils.BYTES_1;
+import static arjdbc.util.QuotingUtils.BYTES_SINGLE_Q_x2;
 
 import org.jruby.Ruby;
-import org.jruby.RubyBigDecimal;
-import org.jruby.RubyBignum;
-import org.jruby.RubyBoolean;
-import org.jruby.RubyFixnum;
-import org.jruby.RubyFloat;
 import org.jruby.RubyModule;
-import org.jruby.RubyNumeric;
-import org.jruby.RubyObjectAdapter;
-import org.jruby.RubyRange;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
@@ -45,278 +38,141 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
 public class DerbyModule {
-    private static RubyObjectAdapter rubyApi;
-    public static void load(RubyModule arJdbc, RubyObjectAdapter adapter) {
+
+    public static RubyModule load(final RubyModule arJdbc) {
         RubyModule derby = arJdbc.defineModuleUnder("Derby");
-        derby.defineAnnotatedMethods(DerbyModule.class);
+        derby.defineAnnotatedMethods( DerbyModule.class );
         RubyModule column = derby.defineModuleUnder("Column");
         column.defineAnnotatedMethods(Column.class);
-        rubyApi = adapter;
+        return derby;
+    }
+
+    public static RubyModule load(final Ruby runtime) {
+        return load( arjdbc.ArJdbcModule.get(runtime) );
     }
 
     public static class Column {
+
         @JRubyMethod(name = "type_cast", required = 1)
-        public static IRubyObject type_cast(IRubyObject recv, IRubyObject value) {
-            Ruby runtime = recv.getRuntime();
+        public static IRubyObject type_cast(final ThreadContext context,
+            final IRubyObject self, final IRubyObject value) {
 
-            if (value.isNil() || ((value instanceof RubyString) && value.toString().trim().equalsIgnoreCase("null"))) {
-                return runtime.getNil();
+            if ( value.isNil() ||
+            ( (value instanceof RubyString) && value.toString().trim().equalsIgnoreCase("null") ) ) {
+                return context.nil;
             }
 
-            String type = rubyApi.getInstanceVariable(recv, "@type").toString();
+            final String type = self.getInstanceVariables().getInstanceVariable("@type").toString();
 
             switch (type.charAt(0)) {
-                case 's': //string
-                    return value;
-                case 't': //text, timestamp, time
-                    if (type.equals("text")) {
-                        return value;
-                    } else if (type.equals("timestamp")) {
-                        return rubyApi.callMethod(recv.getMetaClass(), "string_to_time", value);
-                    } else { //time
-                        return rubyApi.callMethod(recv.getMetaClass(), "string_to_dummy_time", value);
-                    }
-                case 'i': //integer
-                case 'p': //primary key
-                    if (value.respondsTo("to_i")) {
-                        return rubyApi.callMethod(value, "to_i");
-                    } else {
-                        return runtime.newFixnum(value.isTrue() ? 1 : 0);
-                    }
-                case 'd': //decimal, datetime, date
-                    if (type.equals("datetime")) {
-                        return rubyApi.callMethod(recv.getMetaClass(), "string_to_time", value);
-                    } else if (type.equals("date")) {
-                        return rubyApi.callMethod(recv.getMetaClass(), "string_to_date", value);
-                    } else {
-                        return rubyApi.callMethod(recv.getMetaClass(), "value_to_decimal", value);
-                    }
-                case 'f': //float
-                    return rubyApi.callMethod(value, "to_f");
-                case 'b': //binary, boolean
-                    if (type.equals("binary")) {
-                        return rubyApi.callMethod(recv.getMetaClass(), "binary_to_string", value);
-                    } else {
-                        return rubyApi.callMethod(recv.getMetaClass(), "value_to_boolean", value);
-                    }
-            }
-            return value;
-        }
-    }
-
-    @JRubyMethod(name = "quote", required = 1, optional = 1)
-    public static IRubyObject quote(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-        Ruby runtime = recv.getRuntime();
-        IRubyObject value = args[0];
-        if (args.length > 1) {
-            IRubyObject col = args[1];
-            String type = rubyApi.callMethod(col, "type").toString();
-            // intercept and change value, maybe, if the column type is :text or :string
-            if (type.equals("text") || type.equals("string")) {
-            	value = make_ruby_string_for_text_column(context, recv, runtime, value);
-            }
-            if (value instanceof RubyString) {
-                if (type.equals("string")) {
-                    return quote_string_with_surround(runtime, "'", (RubyString)value, "'");
-                } else if (type.equals("text")) {
-                    return quote_string_with_surround(runtime, "CAST('", (RubyString)value, "' AS CLOB)");
-                } else if (type.equals("binary")) {
-                    return hexquote_string_with_surround(runtime, "CAST(X'", (RubyString)value, "' AS BLOB)");
-                } else {
-                    // column type :integer or other numeric or date version
-                    if (only_digits((RubyString)value)) {
-                        return value;
-                    } else {
-                        return super_quote(context, recv, runtime, value, col);
-                    }
+            case 's': //string
+                return value;
+            case 't': //text, timestamp, time
+                if ( type.equals("time") ) {
+                    return self.getMetaClass().callMethod(context, "string_to_dummy_time", value);
                 }
-            } else if ((value instanceof RubyFloat) || (value instanceof RubyFixnum) || (value instanceof RubyBignum)) {
-                if (type.equals("string")) {
-                    return quote_string_with_surround(runtime, "'", RubyString.objAsString(context, value), "'");
+                if ( type.equals("timestamp") ) {
+                    return self.getMetaClass().callMethod(context, "string_to_time", value);
                 }
+                return value; // text
+            case 'i': //integer
+            case 'p': //primary key
+                if ( value.respondsTo("to_i") ) {
+                    return value.callMethod(context, "to_i");
+                }
+                return context.getRuntime().newFixnum( value.isTrue() ? 1 : 0 );
+            case 'd': //decimal, datetime, date
+                if ( type.equals("datetime") ) {
+                    return self.getMetaClass().callMethod(context, "string_to_time", value);
+                }
+                if ( type.equals("date") ) {
+                    return self.getMetaClass().callMethod(context, "string_to_date", value);
+                }
+                return self.getMetaClass().callMethod(context, "value_to_decimal", value);
+            case 'f': //float
+                return value.callMethod(context, "to_f");
+            case 'b': //binary, boolean
+                return type.equals("binary") ?
+                    self.getMetaClass().callMethod(context, "binary_to_string", value) :
+                    self.getMetaClass().callMethod(context, "value_to_boolean", value) ;
             }
-        }
-        return super_quote(context, recv, runtime, value, runtime.getNil());
-    }
-
-    /* 
-     * Derby is not permissive like MySql. Try and send an Integer to a CLOB or VARCHAR column and Derby will vomit.
-     * This method turns non stringy things into strings.
-     */
-    private static IRubyObject make_ruby_string_for_text_column(ThreadContext context, IRubyObject recv, Ruby runtime, IRubyObject value) {
-    	RubyModule multibyteChars = (RubyModule) 
-        ((RubyModule) ((RubyModule) runtime.getModule("ActiveSupport")).getConstant("Multibyte")).getConstantAt("Chars");
-		if (value instanceof RubyString || rubyApi.isKindOf(value, multibyteChars) || value.isNil()) {
-			return value;
-		}
-		if (value instanceof RubyBoolean) {
-            return value.isTrue() ? runtime.newString("1") : runtime.newString("0");
-		} else if (value instanceof RubyFloat || value instanceof RubyFixnum || value instanceof RubyBignum) {
-			return RubyString.objAsString(context, value);
-		} 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 (RubyString)rubyApi.callMethod(recv, "quoted_date", value); 
-	        } else {
-	            return (RubyString)rubyApi.callMethod(value, "to_yaml");
-	        }
-		}
-	}
-
-	private final static ByteList NULL = new ByteList("NULL".getBytes());
-
-    private 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");
+            return value;
         }
 
-        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(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(context, ((type == runtime.newSymbol("integer")) ?
-                                               rubyApi.callMethod(svalue, "to_i") :
-                                               rubyApi.callMethod(svalue, "to_f")));
-            } else {
-                return quote_string_with_surround(runtime, "'", svalue, "'");
-            }
-        } else if (value.isNil()) {
-            return runtime.newString(NULL);
-        } else if (value instanceof RubyBoolean) {
-            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)) {
-            return RubyString.objAsString(context, value);
-        } 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)), "'");
-        } else {
-            return quote_string_with_surround(runtime, "'", (RubyString)(rubyApi.callMethod(value, "to_yaml")), "'");
-        }
     }
 
-    private final static ByteList TWO_SINGLE = new ByteList(new byte[]{'\'','\''});
+    @JRubyMethod(name = "quote_binary", required = 1)
+    public static IRubyObject quote_binary(final ThreadContext context,
+        final IRubyObject self, final IRubyObject string) {
+        final byte[] empty = ByteList.NULL_ARRAY; // ""
+        return quoteStringHex(context.runtime, empty, string, empty);
+    }
 
-    private static IRubyObject quote_string_with_surround(Ruby runtime, String before, RubyString string, String after) {
-        ByteList input = string.getByteList();
-        ByteList output = new ByteList(before.getBytes());
-        for(int i = input.begin; i< input.begin + input.realSize; i++) {
-            switch(input.bytes[i]) {
-            case '\'':
-                output.append(input.bytes[i]);
-                //FALLTHROUGH
-            default:
-                output.append(input.bytes[i]);
-            }
+    private final static byte[] HEX = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
 
-        }
+    private static RubyString quoteStringHex(final Ruby runtime,
+        final byte[] before, final IRubyObject string, final byte[] after) {
 
-        output.append(after.getBytes());
+        final ByteList input = ((RubyString) string).getByteList();
+        final int size = input.getRealSize();
+        final ByteList output = new ByteList( before.length + size * 2 + after.length );
+        output.append( before );
 
-        return runtime.newString(output);
-    }
+        final byte[] inputBytes = input.unsafeBytes();
 
-    private final static byte[] HEX = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
-
-    private static IRubyObject hexquote_string_with_surround(Ruby runtime, String before, RubyString string, String after) {
-        ByteList input = string.getByteList();
-        ByteList output = new ByteList(before.getBytes());
         int written = 0;
-        for(int i = input.begin; i< input.begin + input.realSize; i++) {
-            byte b1 = input.bytes[i];
-            byte higher = HEX[(((char)b1)>>4)%16];
-            byte lower = HEX[((char)b1)%16];
-            output.append(higher);
-            output.append(lower);
+        for (int i = input.getBegin(); i < input.getBegin() + size; i++) {
+            final byte b = inputBytes[i];
+            byte h = HEX[ ( ((char) b) >> 4 ) % 16 ];
+            byte l = HEX[ ( (char) b ) % 16 ];
+            output.append(h).append(l);
             written += 2;
-            if(written >= 16334) { // max hex length = 16334
-              output.append("'||X'".getBytes());
-              written = 0;
+            if ( written >= 16334 ) { // max hex length = 16334
+                output.append("'||X'".getBytes());
+                written = 0;
             }
         }
 
-        output.append(after.getBytes());
-        return runtime.newStringShared(output);
+        output.append( after );
+        return RubyString.newString(runtime, output);
     }
 
-    private static boolean only_digits(RubyString inp) {
-        ByteList input = inp.getByteList();
-        for(int i = input.begin; i< input.begin + input.realSize; i++) {
-            if(input.bytes[i] < '0' || input.bytes[i] > '9') {
-                return false;
-            }
+    @JRubyMethod(name = "quote_string", required = 1)
+    public static IRubyObject quote_string(final IRubyObject self, IRubyObject string) {
+        if ( ! ( string instanceof RubyString ) ) {
+            string = string.asString(); // e.g. Multibyte::Chars
         }
-        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();
+        ByteList bytes = ((RubyString) string).getByteList();
 
-        for(int i = bl.begin; i < bl.begin + bl.realSize; i++) {
-            switch (bl.bytes[i]) {
-            case '\'': break;
-            default: continue;
+        boolean newBytes = false;
+        for ( int i = 0; i < bytes.length(); i++ ) {
+            switch ( bytes.get(i) ) {
+                case '\'': break;
+                default: continue;
             }
-
-            // On first replacement allocate a different bytelist so we don't manip original
-            if(!replacementFound) {
-                i-= bl.begin;
-                bl = new ByteList(bl);
-                replacementFound = true;
+            // on first replacement allocate so we don't manip original
+            if ( ! newBytes ) {
+                bytes = new ByteList(bytes);
+                newBytes = true;
             }
-
-            bl.replace(i, 1, TWO_SINGLE);
-            i+=1;
+            bytes.replace(i, 1, BYTES_SINGLE_Q_x2);
+            i += 1;
         }
-        if(replacementFound) {
-            return recv.getRuntime().newStringShared(bl);
-        } else {
-            return string;
-        }
-    }
 
-    @JRubyMethod(name = "select_all", rest = true)
-    public static IRubyObject select_all(IRubyObject recv, IRubyObject[] args) {
-        return rubyApi.callMethod(recv, "execute", args);
+        return newBytes ? RubyString.newString(self.getRuntime(), bytes) : string;
     }
 
-    @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()) {
-            rubyApi.setInstanceVariable(recv, "@limit", recv.getRuntime().newFixnum(1));
-        }
-        try {
-            IRubyObject result = rubyApi.callMethod(recv, "execute", args);
-            return rubyApi.callMethod(result, "first");
-        } finally {
-            rubyApi.setInstanceVariable(recv, "@limit", recv.getRuntime().getNil());
-        }
+    @JRubyMethod(name = "quoted_true", required = 0, frame = false)
+    public static RubyString quoted_true(
+        final ThreadContext context, final IRubyObject self) {
+        return RubyString.newStringShared(context.runtime, BYTES_1);
     }
 
-    @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();
-        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") || sql.startsWith("values")) {
-            return conn.execute_query(context, args[0]);
-        } else {
-            return conn.execute_update(context, args[0]);
-        }
+    @JRubyMethod(name = "quoted_false", required = 0, frame = false)
+    public static RubyString quoted_false(
+        final ThreadContext context, final IRubyObject self) {
+        return RubyString.newStringShared(context.runtime, BYTES_0);
     }
+
 }

data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java

@@ -0,0 +1,152 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Karol Bucek.
+ *
+ * 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.
+ */
+package arjdbc.derby;
+
+import arjdbc.jdbc.Callable;
+import arjdbc.jdbc.DriverWrapper;
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyBoolean;
+import org.jruby.RubyClass;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+
+/**
+ * ArJdbc::DerbyJdbcConnection
+ *
+ * @author kares
+ */
+public class DerbyRubyJdbcConnection extends RubyJdbcConnection {
+    private static final long serialVersionUID = 4809475910953623325L;
+
+    public DerbyRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createDerbyJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        final RubyClass clazz = getConnectionAdapters(runtime). // ActiveRecord::ConnectionAdapters
+            defineClassUnder("DerbyJdbcConnection", jdbcConnection, ALLOCATOR);
+        clazz.defineAnnotatedMethods(DerbyRubyJdbcConnection.class);
+        return clazz;
+    }
+
+    public static RubyClass load(final Ruby runtime) {
+        RubyClass jdbcConnection = getJdbcConnection(runtime);
+        return createDerbyJdbcConnectionClass(runtime, jdbcConnection);
+    }
+
+    protected static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new DerbyRubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    @Override
+    protected DriverWrapper newDriverWrapper(final ThreadContext context, final String driver) {
+        DriverWrapper driverWrapper = super.newDriverWrapper(context, driver);
+
+        final java.sql.Driver jdbcDriver = driverWrapper.getDriverInstance();
+        if ( jdbcDriver.getClass().getName().startsWith("org.apache.derby.") ) {
+            final int major = jdbcDriver.getMajorVersion();
+            final int minor = jdbcDriver.getMinorVersion();
+            if ( major < 10 || ( major == 10 && minor < 5 ) ) {
+                final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
+                throw new RaiseException(context.runtime, errorClass,
+                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "", false);
+            }
+            if ( major == 10 && minor < 8 ) { // 10.8 ~ supports JDBC 4.1
+                // config[:connection_alive_sql] ||= 'SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY'
+                setConfigValueIfNotSet(context, "connection_alive_sql", // FROM clause mandatory
+                    context.runtime.newString("SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY"));
+            }
+        }
+
+        return driverWrapper;
+    }
+
+    @JRubyMethod(name = "select?", required = 1, meta = true, frame = false)
+    public static RubyBoolean select_p(final ThreadContext context,
+        final IRubyObject self, final IRubyObject sql) {
+        final RubyString sqlStr = sql.asString();
+        if ( isValues(sqlStr) ) return context.runtime.getTrue();
+        return arjdbc.jdbc.RubyJdbcConnection.select_p(context, self, sqlStr);
+    }
+
+    // Derby supports 'stand-alone' VALUES expressions
+    private static final byte[] VALUES = new byte[]{ 'v','a','l','u','e','s' };
+
+    private static boolean isValues(final RubyString sql) {
+        final ByteList sqlBytes = sql.getByteList();
+        return startsWithIgnoreCase(sqlBytes, VALUES);
+    }
+
+    @JRubyMethod(name = {"identity_val_local", "last_insert_id"})
+    public IRubyObject identity_val_local(final ThreadContext context)
+        throws SQLException {
+        return withConnection(context, new Callable<IRubyObject>() {
+            public IRubyObject call(final Connection connection) throws SQLException {
+                PreparedStatement statement = null; ResultSet genKeys = null;
+                try {
+                    statement = connection.prepareStatement("values IDENTITY_VAL_LOCAL()");
+                    genKeys = statement.executeQuery();
+                    return doMapGeneratedKeys(context.getRuntime(), genKeys, true);
+                }
+                catch (final SQLException e) {
+                    debugMessage(context.runtime, "failed to get generated keys: ", e);
+                    throw e;
+                }
+                finally { close(genKeys); close(statement); }
+            }
+        });
+    }
+
+    @Override
+    protected boolean supportsGeneratedKeys(final Connection connection) throws SQLException {
+        return true; // driver reports false from supportsGetGeneratedKeys()
+    }
+
+    @Override
+    protected IRubyObject matchTables(final ThreadContext context,
+            final Connection connection,
+            final String catalog, String schemaPattern,
+            final String tablePattern, final String[] types,
+            final boolean checkExistsOnly) throws SQLException {
+        if (schemaPattern != null && schemaPattern.equals("")) {
+            schemaPattern = null; // Derby doesn't like empty-string schema name
+        }
+        return super.matchTables(context, connection, catalog, schemaPattern, tablePattern, types, checkExistsOnly);
+    }
+
+}