activerecord-jdbc-adapter 5.0.pre1 → 51.0

data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -36,6 +36,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
 import java.sql.Savepoint;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -45,6 +46,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyString;
+import org.jruby.RubyTime;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -58,8 +60,12 @@ import org.jruby.util.ByteList;
 public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     private static final long serialVersionUID = -5783855018818472773L;
 
+    private final RubyString TIMESTAMP_FORMAT;
+
     protected SQLite3RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
+
+        TIMESTAMP_FORMAT = runtime.newString("%F %T.%6N");
     }
 
     public static RubyClass createSQLite3JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
@@ -135,7 +141,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
                 final Ruby runtime = context.runtime;
                 final RubyClass indexDefinition = getIndexDefinition(runtime);
 
-                final TableName table = extractTableName(connection, schemaName, tableName);
+                final TableName table = extractTableName(connection, null, schemaName, tableName);
 
                 final List<RubyString> primaryKeys = primaryKeys(context, connection, table);
 
@@ -282,6 +288,12 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
 
     }
 
+    @Override
+    public IRubyObject begin(ThreadContext context, IRubyObject level) {
+        throw context.runtime.newRaiseException(ActiveRecord(context).getClass("TransactionIsolationError"),
+                "SQLite3 does not support isolation levels");
+    }
+
     @Override
     @JRubyMethod(name = "create_savepoint", optional = 1)
     public IRubyObject create_savepoint(final ThreadContext context, final IRubyObject[] args) {
@@ -289,7 +301,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         if ( name == null || name.isNil() ) {
             throw new IllegalArgumentException("create_savepoint (without name) not implemented!");
         }
-        final Connection connection = getConnection(true);
+        final Connection connection = getConnection(context, true);
         try {
             connection.setAutoCommit(false);
             // NOTE: JDBC driver does not support setSavepoint(String) :
@@ -307,7 +319,7 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
     @Override
     @JRubyMethod(name = "rollback_savepoint", required = 1)
     public IRubyObject rollback_savepoint(final ThreadContext context, final IRubyObject name) {
-        final Connection connection = getConnection(true);
+        final Connection connection = getConnection(context, true);
         try {
             if ( getSavepoints(context).get(name) == null ) {
                 throw context.getRuntime().newRuntimeError("could not rollback savepoint: '" + name + "' (not set)");
@@ -322,22 +334,85 @@ public class SQLite3RubyJdbcConnection extends RubyJdbcConnection {
         }
     }
 
+    // FIXME: Update our JDBC adapter to later version which basically performs this SQL in
+    // this method.  Then we can use base RubyJdbcConnection version.
     @Override
     @JRubyMethod(name = "release_savepoint", required = 1)
     public IRubyObject release_savepoint(final ThreadContext context, final IRubyObject name) {
-        final Connection connection = getConnection(true);
+        Ruby runtime = context.runtime;
+
         try {
-            if ( getSavepoints(context).remove(name) == null ) {
-                throw context.getRuntime().newRuntimeError("could not release savepoint: '" + name + "' (not set)");
+            if (getSavepoints(context).remove(name) == null) {
+                RubyClass invalidStatement = ActiveRecord(context).getClass("StatementInvalid");
+                throw runtime.newRaiseException(invalidStatement, "could not release savepoint: '" + name + "' (not set)");
             }
             // NOTE: JDBC driver does not implement release(Savepoint) :
-            connection.createStatement().execute("RELEASE SAVEPOINT " + name.toString());
+            getConnection(context, true).createStatement().execute("RELEASE SAVEPOINT " + name.toString());
 
-            return context.getRuntime().getNil();
-        }
-        catch (SQLException e) {
+            return runtime.getNil();
+        } catch (SQLException e) {
             return handleException(context, e);
         }
     }
 
+    // Note: transaction_support.rb overrides sqlite3 adapters version which just returns true.
+    // Rather than re-define it in SQLite3Adapter I will just define it here so we appear to have
+    // a consistent JDBC layer.
+    @JRubyMethod(name = "supports_savepoints?")
+    public IRubyObject supports_savepoints_p(final ThreadContext context) throws SQLException {
+        return context.getRuntime().getTrue();
+    }
+
+    @Override
+    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 {
+        // Apparently active record stores booleans in sqlite as 't' and 'f' instead of the built in 1/0
+        statement.setString(index, value.isTrue() ? "t" : "f");
+    }
+
+    // Treat dates as strings, this can potentially be removed if we update
+    // the driver to the latest and tell it to store dates/times as text
+    @Override
+    protected void setDateParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, IRubyObject value,
+        final IRubyObject attribute, final int type) throws SQLException {
+
+        setStringParameter(context, connection, statement, index, value, attribute, type);
+    }
+
+    // The current driver doesn't support dealing with BigDecimal values, so force everything to doubles
+    @Override
+    protected void setDecimalParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, final IRubyObject value,
+        final IRubyObject attribute, final int type) throws SQLException {
+
+        setDoubleParameter(context, connection, statement, index, value, attribute, type);
+    }
+
+    // Treat times as strings
+    @Override
+    protected void setTimeParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, IRubyObject value,
+        final IRubyObject attribute, final int type) throws SQLException {
+
+        setTimestampParameter(context, connection, statement, index,
+                callMethod(context, "time_in_default_timezone", value), attribute, type);
+    }
+
+    // Treat timestamps as strings
+    @Override
+    protected void setTimestampParameter(final ThreadContext context,
+        final Connection connection, final PreparedStatement statement,
+        final int index, IRubyObject value,
+        final IRubyObject attribute, final int type) throws SQLException {
+
+        if (value instanceof RubyTime) value = ((RubyTime) value).strftime(TIMESTAMP_FORMAT);
+
+        setStringParameter(context, connection, statement, index, value, attribute, type);
+    }
 }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 5.0.pre1
+  version: '51.0'
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-11-16 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'
+        version: 5.1.0
+  name: activerecord
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-  prerelease: false
-  type: :runtime
+        version: 5.1.0
 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
@@ -41,7 +41,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
-- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - History.md
@@ -64,7 +63,6 @@ files:
 - lib/active_record/connection_adapters/mssql_adapter.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
-- lib/active_record/connection_adapters/oracle_adapter.rb
 - lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -79,7 +77,11 @@ 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/abstract/connection_management.rb
+- lib/arjdbc/abstract/core.rb
+- lib/arjdbc/abstract/database_statements.rb
+- lib/arjdbc/abstract/statement_cache.rb
+- lib/arjdbc/abstract/transaction_support.rb
 - lib/arjdbc/db2.rb
 - lib/arjdbc/db2/adapter.rb
 - lib/arjdbc/db2/as400.rb
@@ -137,28 +139,17 @@ files:
 - lib/arjdbc/mssql/utils.rb
 - lib/arjdbc/mysql.rb
 - lib/arjdbc/mysql/adapter.rb
-- lib/arjdbc/mysql/bulk_change_table.rb
-- lib/arjdbc/mysql/column.rb
 - lib/arjdbc/mysql/connection_methods.rb
-- lib/arjdbc/mysql/explain_support.rb
-- lib/arjdbc/mysql/schema_creation.rb
-- lib/arjdbc/oracle.rb
-- lib/arjdbc/oracle/adapter.rb
-- lib/arjdbc/oracle/column.rb
-- lib/arjdbc/oracle/connection_methods.rb
 - lib/arjdbc/postgresql.rb
-- lib/arjdbc/postgresql/_bc_time_cast_patch.rb
 - lib/arjdbc/postgresql/adapter.rb
+- lib/arjdbc/postgresql/base/array_decoder.rb
+- lib/arjdbc/postgresql/base/array_encoder.rb
 - lib/arjdbc/postgresql/base/array_parser.rb
-- lib/arjdbc/postgresql/base/oid.rb
 - lib/arjdbc/postgresql/base/pgconn.rb
-- lib/arjdbc/postgresql/base/schema_definitions.rb
 - lib/arjdbc/postgresql/column.rb
 - lib/arjdbc/postgresql/connection_methods.rb
-- lib/arjdbc/postgresql/explain_support.rb
-- lib/arjdbc/postgresql/oid/bytea.rb
+- lib/arjdbc/postgresql/name.rb
 - lib/arjdbc/postgresql/oid_types.rb
-- lib/arjdbc/postgresql/schema_creation.rb
 - lib/arjdbc/railtie.rb
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
@@ -176,8 +167,6 @@ files:
 - lib/arjdbc/tasks/hsqldb_database_tasks.rb
 - lib/arjdbc/tasks/jdbc_database_tasks.rb
 - lib/arjdbc/tasks/mssql_database_tasks.rb
-- lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb
-- lib/arjdbc/tasks/oracle_database_tasks.rb
 - lib/arjdbc/util/quoted_cache.rb
 - lib/arjdbc/util/serialized_attributes.rb
 - lib/arjdbc/util/table_copier.rb
@@ -216,8 +205,6 @@ files:
 - src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java
 - src/java/arjdbc/mysql/MySQLModule.java
 - src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java
-- src/java/arjdbc/oracle/OracleModule.java
-- src/java/arjdbc/oracle/OracleRubyJdbcConnection.java
 - src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java
 - src/java/arjdbc/sqlite3/SQLite3Module.java
 - src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java
@@ -243,14 +230,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 test_files: []
-has_rdoc:

data/Appraisals

@@ -1,41 +0,0 @@
-appraise "rails23" do
-  gem "activerecord", "~> 2.3.18", :require => false
-  gem "rails", "~> 2.3.18"
-end
-
-appraise "rails30" do
-  gem "activerecord", "~> 3.0.20", :require => false
-end
-
-appraise "rails31" do
-  gem "activerecord", "~> 3.1.12", :require => false
-end
-
-appraise "rails32" do
-  gem 'i18n', '< 0.7'
-  gem "activerecord", "~> 3.2.19", :require => false
-end
-
-appraise "rails40" do
-  gem "activerecord", "~> 4.0.12", :require => false
-end
-
-appraise "rails41" do
-  gem "activerecord", "~> 4.1.8", :require => false
-end
-
-appraise "rails42" do
-  gem "activerecord", "~> 4.2.0", :require => false
-end
-
-appraise "rails50" do
-  gem "activerecord", "~> 5.0.0.beta4", :require => false
-end
-
-
-appraise "railsNG" do
-  branch = ( ENV['rails_branch'] || 'master' )
-  gem "activerecord", :github => 'rails/rails', :branch => branch, :require => false
-  gem 'rails', :github => 'rails/rails', :branch => branch
-  gem 'arel', :github => 'rails/arel', :branch => 'master'
-end

data/lib/active_record/connection_adapters/oracle_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/oracle'

data/lib/arjdbc/common_jdbc_methods.rb

@@ -1,89 +0,0 @@
-module ArJdbc
-  # This is minimum amount of code neede from base JDBC Adapter class to make common adapters
-  # work.  This replaces using jdbc/adapter as a base class for all adapters.
-  module CommonJdbcMethods
-    def initialize(connection, logger = nil, config = {})
-      config[:adapter_spec] = adapter_spec(config) unless config.key?(:adapter_spec)
-
-      connection ||= jdbc_connection_class(config[:adapter_spec]).new(config, self)
-
-      super(connection, logger, config)
-    end
-
-    # Starts a database transaction.
-    # @override
-    def begin_db_transaction
-      @connection.begin
-    end
-
-    # Starts a database transaction.
-    # @param isolation the transaction isolation to use
-    def begin_isolated_db_transaction(isolation)
-      @connection.begin(isolation)
-    end
-
-    # Commits the current database transaction.
-    # @override
-    def commit_db_transaction
-      @connection.commit
-    end
-
-    # Rolls back the current database transaction.
-    # @override
-    def exec_rollback_db_transaction
-      @connection.rollback
-    end
-
-
-    def execute(sql, name = nil)
-      # FIXME: Can we kill :skip_logging?
-      if name == :skip_logging
-        @connection.execute(sql)
-      else
-        log(sql, name) { @connection.execute(sql) }
-      end
-    end
-
-    # Take an id from the result of an INSERT query.
-    # @return [Integer, NilClass]
-    def last_inserted_id(result)
-      if result.is_a?(Hash) || result.is_a?(ActiveRecord::Result)
-        result.first.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
-      else
-        result
-      end
-    end
-
-    # Creates a (transactional) save-point one can rollback to.
-    # Unlike 'plain' `ActiveRecord` it is allowed to pass a save-point name.
-    # @param name the save-point name
-    # @return save-point name (even if nil passed will be generated)
-    # @since 1.3.0
-    # @extension added optional name parameter
-    def create_savepoint(name = current_savepoint_name(true))
-      @connection.create_savepoint(name)
-    end
-
-    # Transaction rollback to a given (previously created) save-point.
-    # If no save-point name given rollback to the last created one.
-    # @param name the save-point name
-    # @extension added optional name parameter
-    def rollback_to_savepoint(name = current_savepoint_name(true))
-      @connection.rollback_savepoint(name)
-    end
-
-    # Release a previously created save-point.
-    # @note Save-points are auto-released with the transaction they're created
-    # in (on transaction commit or roll-back).
-    # @param name the save-point name
-    # @extension added optional name parameter
-    def release_savepoint(name = current_savepoint_name(false))
-      @connection.release_savepoint(name)
-    end
-
-    # @private
-    def current_savepoint_name(compat = nil)
-      current_transaction.savepoint_name # unlike AR 3.2-4.1 might be nil
-    end
-  end
-end

data/lib/arjdbc/mysql/bulk_change_table.rb

@@ -1,150 +0,0 @@
-module ArJdbc
-  module MySQL
-    module BulkChangeTable
-
-      # @private
-      AR41 = ::ActiveRecord::VERSION::STRING >= '4.1'
-
-      # @private
-      #ActiveRecordError = ActiveRecord::ActiveRecordError
-
-      # @private
-      ChangeColumnDefinition = ::ActiveRecord::ConnectionAdapters::ChangeColumnDefinition if AR41
-
-      # @override
-      def supports_bulk_alter?; true end
-
-      def bulk_change_table(table_name, operations)
-        sqls = operations.map do |command, args|
-          table, arguments = args.shift, args
-          method = :"#{command}_sql"
-
-          if respond_to?(method, true)
-            send(method, table, *arguments)
-          else
-            raise "Unknown method called : #{method}(#{arguments.inspect})"
-          end
-        end
-        sqls.flatten!
-
-        execute("ALTER TABLE #{quote_table_name(table_name)} #{sqls.join(", ")}")
-      end
-
-      protected
-
-      def add_column_sql(table_name, column_name, type, options = {})
-        add_column_sql = "ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-        add_column_options!(add_column_sql, options)
-        add_column_position!(add_column_sql, options)
-        add_column_sql
-      end unless AR41
-
-      def add_column_sql(table_name, column_name, type, options = {})
-        td = create_table_definition table_name, options[:temporary], options[:options]
-        cd = td.new_column_definition(column_name, type, options)
-        schema_creation.visit_AddColumn cd
-      end if AR41
-
-      def change_column_sql(table_name, column_name, type, options = {})
-        column = column_for(table_name, column_name)
-
-        unless options_include_default?(options)
-          options[:default] = column.default
-        end
-
-        unless options.has_key?(:null)
-          options[:null] = column.null
-        end
-
-        change_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-        add_column_options!(change_column_sql, options)
-        add_column_position!(change_column_sql, options)
-        change_column_sql
-      end unless AR41
-
-      def change_column_sql(table_name, column_name, type, options = {})
-        column = column_for(table_name, column_name)
-
-        unless options_include_default?(options)
-          options[:default] = column.default
-        end
-
-        unless options.has_key?(:null)
-          options[:null] = column.null
-        end
-
-        options[:name] = column.name
-        schema_creation.accept ChangeColumnDefinition.new column, type, options
-      end if AR41
-
-      def rename_column_sql(table_name, column_name, new_column_name)
-        options = {}
-
-        if column = columns(table_name).find { |c| c.name == column_name.to_s }
-          options[:default] = column.default
-          options[:null] = column.null
-          options[:auto_increment] = (column.extra == "auto_increment")
-        else
-          raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
-        end
-
-        current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"]
-        rename_column_sql = "CHANGE #{quote_column_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
-        add_column_options!(rename_column_sql, options)
-        rename_column_sql
-      end unless AR41
-
-      def rename_column_sql(table_name, column_name, new_column_name)
-        options = { :name => new_column_name }
-
-        if column = columns(table_name).find { |c| c.name == column_name.to_s }
-          options[:default] = column.default
-          options[:null] = column.null
-          options[:auto_increment] = (column.extra == "auto_increment")
-        else
-          raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
-        end
-
-        current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"]
-        schema_creation.accept ChangeColumnDefinition.new column, current_type, options
-      end if AR41
-
-      def remove_column_sql(table_name, column_name, type = nil, options = nil)
-        "DROP #{quote_column_name(column_name)}"
-      end
-
-      def remove_columns_sql(table_name, *column_names)
-        column_names.map { |column_name| remove_column_sql(table_name, column_name) }
-      end
-
-      def add_index_sql(table_name, column_name, options = {})
-        index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
-        "ADD #{index_type} INDEX #{index_name} (#{index_columns})"
-      end
-
-      def remove_index_sql(table_name, options = {})
-        index_name = index_name_for_remove(table_name, options)
-        "DROP INDEX #{index_name}"
-      end
-
-      def add_timestamps_sql(table_name, options = {})
-        [add_column_sql(table_name, :created_at, :datetime, options), add_column_sql(table_name, :updated_at, :datetime, options)]
-      end
-
-      def remove_timestamps_sql(table_name, options = nil)
-        [remove_column_sql(table_name, :updated_at), remove_column_sql(table_name, :created_at)]
-      end
-
-      private
-
-      def add_column_position!(sql, options)
-        if options[:first]
-          sql << " FIRST"
-        elsif options[:after]
-          sql << " AFTER #{quote_column_name(options[:after])}"
-        end
-      end
-
-    end
-  end
-end