activerecord-jdbc-adapter 1.3.25 → 5.0.pre1

data/lib/arjdbc/tasks/database_tasks.rb

@@ -39,7 +39,7 @@ module ArJdbc
     register_tasks(/(oci|oracle)/, OracleDatabaseTasks)
     register_tasks(/mssql/, MSSQLDatabaseTasks) # (built-in) alias
     # tasks for custom (JDBC) adapters :
-    register_tasks(/(db2|as400)/, DB2DatabaseTasks)
+    register_tasks(/db2/, DB2DatabaseTasks)
     register_tasks(/derby/, DerbyDatabaseTasks)
     register_tasks(/h2/, H2DatabaseTasks)
     register_tasks(/hsqldb/, HSQLDBDatabaseTasks)

data/lib/arjdbc/tasks/databases3.rake

@@ -112,7 +112,7 @@ namespace :db do
         unless search_path.blank?
           search_path = search_path.split(",").map{ |part| "--schema=#{Shellwords.escape(part.strip)}" }.join(" ")
         end
-        sh "pg_dump -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}"
+        sh "pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}"
 
         File.open(filename, 'a') { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
       when /sqlite/

data/lib/arjdbc/tasks/databases4.rake

@@ -1,7 +1,7 @@
 module ActiveRecord::Tasks
 
   DatabaseTasks.module_eval do
-
+    
     # patched to adapt jdbc configuration
     def each_current_configuration(environment)
       environments = [environment]
@@ -31,14 +31,9 @@ module ActiveRecord::Tasks
   MySQLDatabaseTasks.class_eval do
 
     def error_class
-      @_error_class ||= begin
-        unless ActiveRecord::JDBCError.instance_methods.include?(:error)
-          ActiveRecord::JDBCError.send :alias_method, :error, :sql_exception
-        end
-        ActiveRecord::JDBCError
-      end
+      ActiveRecord::JDBCError
     end
 
   end
-
+  
 end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.25"
+  VERSION = "5.0.pre1"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/rakelib/db.rake

@@ -6,8 +6,6 @@ namespace :db do
   task :mysql do
     fail "could not create test database: mysql executable not found" unless mysql = which('mysql')
     load 'test/db/mysql_config.rb' # rescue nil
-    puts MYSQL_CONFIG.inspect if $VERBOSE
-    # DROP USER arjdbc@localhost; __ERROR 1396 (HY000): Operation CREATE USER failed__
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
 CREATE USER #{MYSQL_CONFIG[:username]}@localhost;
@@ -17,13 +15,13 @@ GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 SET PASSWORD FOR #{MYSQL_CONFIG[:username]}@localhost = PASSWORD('#{MYSQL_CONFIG[:password]}');
 SQL
     params = { '-u' => 'root' }
-    if ENV['DATABASE_YML']; require 'yaml'
-      params['-p'] = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
+    if ENV['DATABASE_YML']
+      require 'yaml'
+      password = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
+      params['--password'] = password
     end
-    params['-u'] = ENV['MY_USER'] if ENV['MY_USER']
-    params['-p'] = ENV['MY_PASSWORD'] if ENV['MY_PASSWORD']
     puts "Creating MySQL (test) database: #{MYSQL_CONFIG[:database]}"
-    sh "cat #{script.path} | #{mysql} -f #{params.map {|k, v| "#{k}#{v}"}.join(' ')}", :verbose => $VERBOSE # so password is not echoed
+    sh "cat #{script.path} | #{mysql} -f #{params.to_a.join(' ')}", :verbose => $VERBOSE # so password is not echoed
   end
 
   desc "Creates the test database for PostgreSQL"
@@ -31,7 +29,6 @@ SQL
     fail 'could not create test database: psql executable not found' unless psql = which('psql')
     fail 'could not create test database: missing "postgres" role' unless PostgresHelper.postgres_role?
     load 'test/db/postgres_config.rb' # rescue nil
-    puts POSTGRES_CONFIG.inspect if $VERBOSE
     script = sql_script <<-SQL, 'psql'
 DROP DATABASE IF EXISTS #{POSTGRES_CONFIG[:database]};
 DROP USER IF EXISTS #{POSTGRES_CONFIG[:username]};

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -244,7 +244,7 @@ public class RubyJdbcConnection extends RubyObject {
         });
     }
 
-    @JRubyMethod(name = "begin", optional = 1) // optional isolation argument for AR-4.0
+    @JRubyMethod(name = {"begin", "transaction"}, optional = 1) // optional isolation argument for AR-4.0
     public IRubyObject begin(final ThreadContext context, final IRubyObject[] args) {
         final IRubyObject isolation = args.length > 0 ? args[0] : null;
         try { // handleException == false so we can handle setTXIsolation
@@ -588,19 +588,25 @@ public class RubyJdbcConnection extends RubyObject {
             public IRubyObject call(final Connection connection) throws SQLException {
                 Statement statement = null;
                 final String query = sql.convertToString().getUnicodeValue();
+
                 try {
                     statement = createStatement(context, connection);
                     if ( doExecute(statement, query) ) {
-                        return mapResults(context, connection, statement, false);
+                        ResultSet resultSet = statement.getResultSet();
+                        ColumnData[] columns = extractColumns(context.runtime, connection, resultSet, false);
+
+                        return mapToResult(context, context.runtime, connection, resultSet, columns);
                     } else {
-                        return mapGeneratedKeysOrUpdateCount(context, connection, statement);
+                        //return context.runtime.newFixnum( statement.getUpdateCount());
+                        return context.runtime.newEmptyArray();
+                        //return mapGeneratedKeysOrUpdateCount(context, connection, statement);
                     }
-                }
-                catch (final SQLException e) {
+                } catch (final SQLException e) {
                     debugErrorSQL(context, query);
                     throw e;
+                } finally {
+                    close(statement);
                 }
-                finally { close(statement); }
             }
         });
     }
@@ -695,6 +701,14 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
+    @JRubyMethod(name = {"execute_prepared_update"}, required = 2)
+    public IRubyObject execute_prepared_update(final ThreadContext context,
+                                               final IRubyObject sql, final IRubyObject binds) throws SQLException {
+
+        final String query = sql.convertToString().getUnicodeValue();
+        return executePreparedUpdate(context, query, (List) binds, false);
+    }
+
     /**
      * @param context
      * @param query
@@ -879,7 +893,6 @@ public class RubyJdbcConnection extends RubyObject {
      * @param sql
      * @return raw query result as a name => value Hash (unless block given)
      * @throws SQLException
-     * @see #execute_query(ThreadContext, IRubyObject[], Block)
      */
     @JRubyMethod(name = "execute_query", required = 1)
     public IRubyObject execute_query(final ThreadContext context,
@@ -895,7 +908,6 @@ public class RubyJdbcConnection extends RubyObject {
      * @return and <code>ActiveRecord::Result</code>
      * @throws SQLException
      *
-     * @see #execute_query(ThreadContext, IRubyObject, IRubyObject, Block)
      */
     @JRubyMethod(name = "execute_query", required = 2, optional = 1)
     // @JRubyMethod(name = "execute_query", required = 1, optional = 2)
@@ -930,6 +942,18 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
+    @JRubyMethod(name = "execute_prepared_query")
+    public IRubyObject execute_prepared_query(final ThreadContext context,
+                                              final IRubyObject sql, final IRubyObject binds) throws SQLException {
+        final String query = sql.convertToString().getUnicodeValue();
+
+        if (binds == null || !(binds instanceof RubyArray)) {
+            throw context.runtime.newArgumentError("binds exptected to an instance of Array");
+        }
+
+        return executePreparedQuery(context, query, (List) binds, 0);
+    }
+
     /**
      * NOTE: This methods behavior changed in AR-JDBC 1.3 the old behavior is
      * achievable using {@link #executeQueryRaw(ThreadContext, String, int, Block)}.
@@ -939,25 +963,59 @@ public class RubyJdbcConnection extends RubyObject {
      * @param maxRows
      * @return AR (mapped) query result
      *
-     * @see #execute_query(ThreadContext, IRubyObject)
-     * @see #execute_query(ThreadContext, IRubyObject, IRubyObject)
-     * @see #mapToResult(ThreadContext, Ruby, DatabaseMetaData, ResultSet, RubyJdbcConnection.ColumnData[])
      */
     protected IRubyObject executeQuery(final ThreadContext context, final String query, final int maxRows) {
         return withConnection(context, new Callable<IRubyObject>() {
             public IRubyObject call(final Connection connection) throws SQLException {
-                Statement statement = null; ResultSet resultSet = null;
+                Statement statement = null;
+                ResultSet resultSet = null;
+
                 try {
                     statement = createStatement(context, connection);
                     statement.setMaxRows(maxRows); // zero means there is no limit
                     resultSet = statement.executeQuery(query);
                     return mapQueryResult(context, connection, resultSet);
+                } catch (final SQLException e) {
+                    debugErrorSQL(context, query);
+                    throw e;
+                } finally {
+                    close(resultSet);
+                    close(statement);
                 }
-                catch (final SQLException e) {
+            }
+        });
+    }
+
+    @JRubyMethod
+    public IRubyObject execute_prepared(final ThreadContext context, final IRubyObject sql, final IRubyObject binds) {
+        return withConnection(context, new Callable<IRubyObject>() {
+            public IRubyObject call(final Connection connection) throws SQLException {
+                PreparedStatement statement = null;
+                final String query = sql.convertToString().getUnicodeValue();
+
+                // FIXME: array type check for binds
+
+                try {
+                    statement = connection.prepareStatement(query);
+                    setStatementParameters(context, connection, statement, (List) binds);
+                    boolean hasResultSet = statement.execute();
+
+                    if (hasResultSet) {
+                        ResultSet resultSet = statement.getResultSet();
+                        ColumnData[] columns = extractColumns(context.runtime, connection, resultSet, false);
+
+                        return mapToResult(context, context.runtime, connection, resultSet, columns);
+                    } else {
+                        return context.runtime.newEmptyArray();
+                        //return context.runtime.newFixnum( statement.getUpdateCount());
+//                        return mapGeneratedKeysOrUpdateCount(context, connection, statement);
+                    }
+                } catch (final SQLException e) {
                     debugErrorSQL(context, query);
                     throw e;
+                } finally {
+                    close(statement);
                 }
-                finally { close(resultSet); close(statement); }
             }
         });
     }
@@ -1473,8 +1531,8 @@ public class RubyJdbcConnection extends RubyObject {
         final IRubyObject record, final IRubyObject column, final IRubyObject value)
         throws SQLException {
 
-        // column.type == :binary
-        final boolean binary = column.callMethod(context, "type").toString().equals("binary");
+        final boolean binary = // column.type == :binary
+            column.callMethod(context, "type").toString() == (Object) "binary";
 
         final IRubyObject recordClass = record.callMethod(context, "class");
         final IRubyObject adapter = recordClass.callMethod(context, "connection");
@@ -1671,7 +1729,7 @@ public class RubyJdbcConnection extends RubyObject {
 
     /**
      * @deprecated this method is no longer used, instead consider overriding
-     * {@link #mapToResult(ThreadContext, Ruby, DatabaseMetaData, ResultSet, RubyJdbcConnection.ColumnData[])}
+     * {@link #mapToResult(ThreadContext, Ruby, Connection, ResultSet, RubyJdbcConnection.ColumnData[])}
      */
     @Deprecated
     protected void populateFromResultSet(
@@ -1688,7 +1746,7 @@ public class RubyJdbcConnection extends RubyObject {
      * Maps a query result into a <code>ActiveRecord</code> result.
      * @param context
      * @param runtime
-     * @param metaData
+     * @param connection
      * @param resultSet
      * @param columns
      * @return since 3.1 expected to return a <code>ActiveRecord::Result</code>
@@ -2163,20 +2221,26 @@ public class RubyJdbcConnection extends RubyObject {
         }
     }
 
-    protected void setStatementParameter(final ThreadContext context,
-            final Ruby runtime, final Connection connection,
-            final PreparedStatement statement, final int index,
-            final Object rawValue, final IRubyObject column) throws SQLException {
-        final Object value;
+    // So far we have only examined the needs to Sqlite3 but for that adapter (and it is old JDBC adapter)
+    // we can pass all tests but binary column types with just the supplied value.  So we will leave it
+    // this way until we upgrade Sqlite adapter and get some more databases supported.
+    protected int typeHack(ThreadContext context, IRubyObject column, Object value) throws SQLException {
+        if (column != null) {
+            String columnType = column.asString().toString();
 
-        if ( isAr42(column) ) {
-            final IRubyObject castType = column.callMethod(context, "cast_type");
-            value = castType.callMethod(context, "type_cast_for_database", (IRubyObject) rawValue);
-        } else {
-            value = rawValue;
+            if (columnType.equals("binary")) return jdbcTypeFor(context, context.runtime, column, value);
+
+            column = null;
         }
 
-        final int type = jdbcTypeFor(context, runtime, column, value);
+        return jdbcTypeFor(context, context.runtime, column, value);
+    }
+
+    protected void setStatementParameter(final ThreadContext context,
+            final Ruby runtime, final Connection connection,
+            final PreparedStatement statement, final int index,
+            final Object value, IRubyObject column) throws SQLException {
+        int type = typeHack(context, column, value);
 
         switch (type) {
             case Types.TINYINT:
@@ -2218,7 +2282,7 @@ public class RubyJdbcConnection extends RubyObject {
                 setXmlParameter(context, connection, statement, index, value, column, type);
                 break;
             case Types.ARRAY:
-                setArrayParameter(context, connection, statement, index, rawValue, column, type);
+                setArrayParameter(context, connection, statement, index, value, column, type);
                 break;
             case Types.JAVA_OBJECT:
             case Types.OTHER:
@@ -2878,10 +2942,11 @@ public class RubyJdbcConnection extends RubyObject {
             }
             else { // should be a RubyString
                 final ByteList blob = value.asString().getByteList();
-                statement.setBinaryStream(index,
-                    new ByteArrayInputStream(blob.unsafeBytes(), blob.getBegin(), blob.getRealSize()),
-                    blob.getRealSize() // length
-                );
+                statement.setBytes(index, blob.bytes());
+                //statement.setBinaryStream(index,
+//                    new ByteArrayInputStream(blob.unsafeBytes(), blob.getBegin(), blob.getRealSize()),
+//                    blob.getRealSize() // length
+//                );
                 // JDBC 4.0 :
                 //statement.setBlob(index,
                 //    new ByteArrayInputStream(bytes.unsafeBytes(), bytes.getBegin(), bytes.getRealSize())
@@ -3117,7 +3182,7 @@ public class RubyJdbcConnection extends RubyObject {
     /**
      * Create a string which represents a SQL type usable by Rails from the
      * resultSet column meta-data
-     * @param resultSet.
+     * @param resultSet
      */
     protected String typeFromResultSet(final ResultSet resultSet) throws SQLException {
         final int precision = intFromResultSet(resultSet, COLUMN_SIZE);
@@ -3432,7 +3497,7 @@ public class RubyJdbcConnection extends RubyObject {
     /**
      * Extract columns from result set.
      * @param runtime
-     * @param metaData
+     * @param connection
      * @param resultSet
      * @param downCase
      * @return columns data
@@ -3452,7 +3517,7 @@ public class RubyJdbcConnection extends RubyObject {
     }
 
     /**
-     * @deprecated renamed and parameterized to {@link #withConnection(ThreadContext, SQLBlock)}
+     * @deprecated renamed and parameterized to {@link #withConnection(ThreadContext, boolean, Callable)}
      */
     @Deprecated
     @SuppressWarnings("unchecked")

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -54,7 +54,6 @@ 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;
 
 /**
  *
@@ -103,12 +102,6 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
             final int value = resultSet.getInt(column);
             return resultSet.wasNull() ? runtime.getNil() : runtime.newFixnum(value);
         }
-        else if ( type == Types.BINARY || type == Types.VARBINARY) {
-            final byte[] bytes = resultSet.getBytes(column);
-            if ( bytes == null || resultSet.wasNull() ) return runtime.getNil();
-            final ByteList byteList = new ByteList(bytes, false);
-            return new RubyString(runtime, runtime.getString(), byteList);
-        }
         return super.jdbcToRuby(context, runtime, column, type, resultSet);
     }
 

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.25
+  version: 5.0.pre1
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  name: activerecord
-  prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+  prerelease: false
+  type: :runtime
 description: 'AR-JDBC is a database adapter for Rails'' ActiveRecord component designed
   to be used with JRuby built upon Java''s JDBC API for database access. Provides
   (ActiveRecord) built-in adapters: MySQL, PostgreSQL and SQLite3 as well as adapters
@@ -85,6 +79,7 @@ files:
 - lib/arel/visitors/sql_server.rb
 - lib/arel/visitors/sql_server/ng42.rb
 - lib/arjdbc.rb
+- lib/arjdbc/common_jdbc_methods.rb
 - lib/arjdbc/db2.rb
 - lib/arjdbc/db2/adapter.rb
 - lib/arjdbc/db2/as400.rb
@@ -114,7 +109,6 @@ files:
 - lib/arjdbc/jdbc/adapter.rb
 - lib/arjdbc/jdbc/adapter_java.jar
 - lib/arjdbc/jdbc/adapter_require.rb
-- lib/arjdbc/jdbc/arel_support.rb
 - lib/arjdbc/jdbc/base_ext.rb
 - lib/arjdbc/jdbc/callbacks.rb
 - lib/arjdbc/jdbc/column.rb
@@ -134,7 +128,6 @@ files:
 - lib/arjdbc/mimer/adapter.rb
 - lib/arjdbc/mssql.rb
 - lib/arjdbc/mssql/adapter.rb
-- lib/arjdbc/mssql/attributes_for_update.rb
 - lib/arjdbc/mssql/column.rb
 - lib/arjdbc/mssql/connection_methods.rb
 - lib/arjdbc/mssql/explain_support.rb
@@ -170,7 +163,6 @@ files:
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
 - lib/arjdbc/sqlite3/connection_methods.rb
-- lib/arjdbc/sqlite3/explain_support.rb
 - lib/arjdbc/sybase.rb
 - lib/arjdbc/sybase/adapter.rb
 - lib/arjdbc/tasks.rb
@@ -251,13 +243,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.6.12
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 test_files: []
+has_rdoc: