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

data/src/java/arjdbc/firebird/FirebirdRubyJdbcConnection.java

@@ -0,0 +1,174 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2015 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.firebird;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.PreparedStatement;
+import java.sql.ResultSetMetaData;
+import java.sql.Types;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyString;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * @author kares
+ */
+public class FirebirdRubyJdbcConnection extends RubyJdbcConnection {
+
+    protected FirebirdRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createFirebirdJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        final RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).
+            defineClassUnder("FirebirdJdbcConnection", jdbcConnection, ALLOCATOR);
+        clazz.defineAnnotatedMethods(FirebirdRubyJdbcConnection.class);
+        return clazz;
+    }
+
+    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new FirebirdRubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    @Override // resultSet.wasNull() might be falsy for '' treated as null
+    protected IRubyObject stringToRuby(final ThreadContext context,
+        final Ruby runtime, final ResultSet resultSet, final int column)
+        throws SQLException {
+        final String value = resultSet.getString(column);
+        if ( value == null ) return runtime.getNil();
+        return RubyString.newUnicodeString(runtime, value);
+    }
+
+    @Override // booleans are emulated can not setNull(index, Types.BOOLEAN)
+    protected void setBooleanParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, final IRubyObject value,
+        final IRubyObject attribute, final int type) throws SQLException {
+        if ( value.isNil() ) statement.setNull(index, Types.CHAR);
+        else {
+            statement.setBoolean(index, value.isTrue());
+        }
+    }
+
+    protected IRubyObject jdbcToRuby(
+        final ThreadContext context, final Ruby runtime,
+        final int column, final int type, final ResultSet resultSet)
+        throws SQLException {
+
+        switch (type) {
+        case SMALL_CHAR_1:
+            return smallChar1ToRuby(runtime, resultSet, column);
+        case SMALL_CHAR_2:
+            return smallChar2ToRuby(runtime, resultSet, column);
+        }
+        return super.jdbcToRuby(context, runtime, column, type, resultSet);
+    }
+
+    private static IRubyObject smallChar1ToRuby(
+        final Ruby runtime, final ResultSet resultSet, final int column)
+        throws SQLException {
+        String value = resultSet.getString(column);
+        if ( value == null ) return runtime.getNil();
+        if ( value.length() > 1 && value.charAt(1) == ' ' ) {
+            value = value.substring(0, 1);
+        }
+        return RubyString.newUnicodeString(runtime, value);
+    }
+
+    private static IRubyObject smallChar2ToRuby(
+        final Ruby runtime, final ResultSet resultSet, final int column)
+        throws SQLException {
+        String value = resultSet.getString(column);
+        if ( value == null ) return runtime.getNil();
+        if ( value.length() > 2 && value.charAt(2) == ' ' ) {
+            value = value.substring(0, 2);
+        }
+        return RubyString.newUnicodeString(runtime, value);
+    }
+
+    private final static int SMALL_CHAR_1 = 31431001;
+    private final static int SMALL_CHAR_2 = 31431002;
+
+    @Override
+    protected ColumnData[] extractColumns(final ThreadContext context,
+        final Connection connection, final ResultSet resultSet,
+        final boolean downCase) throws SQLException {
+
+        final ResultSetMetaData resultMetaData = resultSet.getMetaData();
+
+        final int columnCount = resultMetaData.getColumnCount();
+        final ColumnData[] columns = new ColumnData[columnCount];
+
+        for ( int i = 1; i <= columnCount; i++ ) { // metadata is one-based
+            String name = resultMetaData.getColumnLabel(i);
+            if ( downCase ) {
+                name = name.toLowerCase();
+            } else {
+                name = caseConvertIdentifierForRails(connection, name);
+            }
+            final RubyString columnName = RubyString.newUnicodeString(context.runtime, name);
+
+            int columnType = resultMetaData.getColumnType(i);
+            if (columnType == Types.CHAR) {
+                // CHAR(1) 'aligned' by JayBird to "1  "
+                final int prec = resultMetaData.getPrecision(i);
+                if ( prec == 1 ) {
+                    columnType = SMALL_CHAR_1;
+                }
+                else if ( prec == 2 ) {
+                    columnType = SMALL_CHAR_2;
+                }
+            }
+
+            columns[i - 1] = new ColumnData(columnName, columnType, i);
+        }
+
+        return columns;
+    }
+
+    // storesMixedCaseIdentifiers() return false;
+    // storesLowerCaseIdentifiers() return false;
+    // storesUpperCaseIdentifiers() return true;
+
+    @Override
+    protected String caseConvertIdentifierForRails(final Connection connection, final String value) {
+        return value == null ? null : value.toLowerCase();
+    }
+
+    @Override
+    protected String caseConvertIdentifierForJdbc(final Connection connection, final String value) {
+        return value == null ? null : value.toUpperCase();
+    }
+
+}

data/src/java/arjdbc/{jdbc/JdbcConnectionFactory.java → h2/H2Module.java}

@@ -1,4 +1,5 @@
 /***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
  * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
  * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
  *
@@ -22,15 +23,28 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  ***** END LICENSE BLOCK *****/
 
-package arjdbc.jdbc;
+package arjdbc.h2;
 
-import java.sql.Connection;
+import org.jruby.Ruby;
+import org.jruby.RubyModule;
 
 /**
- * Interface to be implemented in Ruby for retrieving a new connection
+ * ArJdbc::H2
  *
- * @author nicksieger
+ * @author kares
  */
-public interface JdbcConnectionFactory {
-    Connection newConnection();
+//@org.jruby.anno.JRubyModule(name = "ArJdbc::H2")
+public class H2Module {
+
+    public static RubyModule load(final RubyModule arJdbc) {
+        RubyModule h2 = arJdbc.defineModuleUnder("H2");
+        // NOTE: currently no Java implemented Ruby methods
+        // h2.defineAnnotatedMethods( H2Module.class );
+        return h2;
+    }
+
+    public static RubyModule load(final Ruby runtime) {
+        return load( arjdbc.ArJdbcModule.get(runtime) );
+    }
+
 }

data/src/java/arjdbc/h2/H2RubyJdbcConnection.java

@@ -1,5 +1,4 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** 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>
@@ -26,11 +25,8 @@
 
 package arjdbc.h2;
 
-import java.sql.ResultSet;
+import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.Types;
-
-import arjdbc.jdbc.RubyJdbcConnection;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -41,20 +37,27 @@ import org.jruby.runtime.builtin.IRubyObject;
  *
  * @author nicksieger
  */
-public class H2RubyJdbcConnection extends RubyJdbcConnection {
-    protected H2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+@org.jruby.anno.JRubyClass(name = "ActiveRecord::ConnectionAdapters::H2JdbcConnection")
+public class H2RubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection {
+    private static final long serialVersionUID = -2652911264521657428L;
+
+    public H2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
     public static RubyClass createH2JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("H2JdbcConnection",
-                jdbcConnection, H2_JDBCCONNECTION_ALLOCATOR);
+        RubyClass clazz = getConnectionAdapters(runtime).
+            defineClassUnder("H2JdbcConnection", jdbcConnection, ALLOCATOR);
         clazz.defineAnnotatedMethods(H2RubyJdbcConnection.class);
-
         return clazz;
     }
 
-    private static ObjectAllocator H2_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+    public static RubyClass load(final Ruby runtime) {
+        RubyClass jdbcConnection = getJdbcConnection(runtime);
+        return createH2JdbcConnectionClass(runtime, jdbcConnection);
+    }
+
+    protected static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
             return new H2RubyJdbcConnection(runtime, klass);
         }
@@ -67,4 +70,16 @@ public class H2RubyJdbcConnection extends RubyJdbcConnection {
     protected boolean databaseSupportsSchemas() {
         return true;
     }
+
+    @Override
+    protected String caseConvertIdentifierForJdbc(final Connection connection, final String value) {
+        if ( value == null ) return null;
+        return value.toUpperCase();
+    }
+
+    // NOTE: not supported
+    // org.h2.jdbc.JdbcSQLException: Hexadecimal string contains non-hex character: "PUBLIC" [90004-178]
+    //@Override
+    //protected boolean useByteStrings() { return false; }
+
 }

data/src/java/arjdbc/hsqldb/HSQLDBModule.java

@@ -0,0 +1,73 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2013 Karol Bucek <self@kares.org>
+ * 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
+ * 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.hsqldb;
+
+import static arjdbc.util.QuotingUtils.BYTES_0;
+import static arjdbc.util.QuotingUtils.BYTES_1;
+import static arjdbc.util.QuotingUtils.quoteSingleQuotesWithFallback;
+
+import org.jruby.Ruby;
+import org.jruby.RubyModule;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+public class HSQLDBModule {
+
+    public static RubyModule load(final RubyModule arJdbc) {
+        RubyModule hsqldb = arJdbc.defineModuleUnder("HSQLDB");
+        hsqldb.defineAnnotatedMethods( HSQLDBModule.class );
+        return hsqldb;
+    }
+
+    public static RubyModule load(final Ruby runtime) {
+        return load( arjdbc.ArJdbcModule.get(runtime) );
+    }
+
+    @JRubyMethod(name = "quote_string", required = 1, frame = false)
+    public static IRubyObject quote_string(
+            final ThreadContext context,
+            final IRubyObject self,
+            final IRubyObject string) {
+        return quoteSingleQuotesWithFallback(context, string);
+    }
+
+    @JRubyMethod(name = "quoted_true", required = 0, frame = false)
+    public static IRubyObject quoted_true(
+            final ThreadContext context,
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_1);
+    }
+
+    @JRubyMethod(name = "quoted_false", required = 0, frame = false)
+    public static IRubyObject quoted_false(
+            final ThreadContext context,
+            final IRubyObject self) {
+        return RubyString.newString(context.getRuntime(), BYTES_0);
+    }
+
+}

data/src/java/arjdbc/informix/InformixRubyJdbcConnection.java

@@ -35,6 +35,7 @@ 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;
 
 /**
@@ -64,11 +65,11 @@ public class InformixRubyJdbcConnection extends RubyJdbcConnection {
      * Treat LONGVARCHAR as CLOB on Informix for purposes of converting a JDBC value to Ruby.
      */
     @Override
-    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
-            throws SQLException {
-        if (type == Types.LONGVARCHAR) {
-            type = Types.CLOB;
-        }
-        return super.jdbcToRuby(runtime, column, type, resultSet);
+    protected IRubyObject jdbcToRuby(
+        final ThreadContext context, final Ruby runtime,
+        final int column, int type, final ResultSet resultSet)
+        throws SQLException {
+        if ( type == Types.LONGVARCHAR ) type = Types.CLOB;
+        return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
 }

data/src/java/arjdbc/jdbc/AdapterJavaService.java

@@ -1,5 +1,5 @@
-/*
- **** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2014 Karol Bucek <self@kares.org>
  * 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>
@@ -28,38 +28,16 @@ package arjdbc.jdbc;
 
 import java.io.IOException;
 
-import arjdbc.derby.DerbyModule;
-import arjdbc.h2.H2RubyJdbcConnection;
-import arjdbc.informix.InformixRubyJdbcConnection;
-import arjdbc.mssql.MssqlRubyJdbcConnection;
-import arjdbc.mysql.MySQLModule;
-import arjdbc.oracle.OracleRubyJdbcConnection;
-import arjdbc.postgresql.PostgresqlRubyJdbcConnection;
-import arjdbc.sqlite3.Sqlite3RubyJdbcConnection;
-
 import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.RubyModule;
-import org.jruby.RubyObjectAdapter;
-import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.runtime.load.BasicLibraryService;
 
+@Deprecated
 public class AdapterJavaService implements BasicLibraryService {
-    private static RubyObjectAdapter rubyApi;
 
     public boolean basicLoad(final Ruby runtime) throws IOException {
-        RubyClass jdbcConnection = RubyJdbcConnection.createJdbcConnectionClass(runtime);
-        PostgresqlRubyJdbcConnection.createPostgresqlJdbcConnectionClass(runtime, jdbcConnection);
-        MssqlRubyJdbcConnection.createMssqlJdbcConnectionClass(runtime, jdbcConnection);
-        InformixRubyJdbcConnection.createInformixJdbcConnectionClass(runtime, jdbcConnection);
-        OracleRubyJdbcConnection.createOracleJdbcConnectionClass(runtime, jdbcConnection);
-        Sqlite3RubyJdbcConnection.createSqlite3JdbcConnectionClass(runtime, jdbcConnection);
-        H2RubyJdbcConnection.createH2JdbcConnectionClass(runtime, jdbcConnection);
-        RubyModule arJdbc = runtime.getOrCreateModule("ArJdbc");
-
-        rubyApi = JavaEmbedUtils.newObjectAdapter();
-        MySQLModule.load(arJdbc);
-        DerbyModule.load(arJdbc, rubyApi);
+        RubyJdbcConnection.createJdbcConnectionClass(runtime);
+        arjdbc.ArJdbcModule.load(runtime);
         return true;
     }
-}
+
+}

data/src/java/arjdbc/jdbc/Callable.java

@@ -0,0 +1,44 @@
+/*
+ * 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.jdbc;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * A JDBC connection callable ("block") of code.
+ * 
+ * @author kares
+ */
+public interface Callable<T> {
+    
+    /**
+     * Perform an operation in the context of the given connection.
+     * @param connection
+     * @return
+     * @throws SQLException 
+     */
+    T call(final Connection connection) throws SQLException;
+    
+}