Merge pull request #1168 from JesseChavez/rails_72_fixes_part1

Rails 7.2 fixes mostly SQLite and some for MySQL

Author: enebo

Diff for: lib/arjdbc/jdbc/adapter.rb

@@ -5,7 +5,6 @@
 
 require 'arjdbc/version'
 require 'arjdbc/jdbc/java'
-require 'arjdbc/jdbc/base_ext'
 require 'arjdbc/jdbc/error'
 require 'arjdbc/jdbc/connection_methods'
 require 'arjdbc/jdbc/column'

Diff for: lib/arjdbc/jdbc/base_ext.rb

@@ -84,15 +84,6 @@ def initialize(...)
         @connection_parameters = conn_params
       end
 
-      def self.database_exists?(config)
-        conn = ActiveRecord::Base.mysql2_connection(config)
-        conn && conn.really_valid?
-      rescue ActiveRecord::NoDatabaseError
-        false
-      ensure
-        conn.disconnect! if conn
-      end
-
       def supports_json?
         !mariadb? && database_version >= '5.7.8'
       end
@@ -250,7 +241,7 @@ def configure_connection
 
       # e.g. "5.7.20-0ubuntu0.16.04.1"
       def full_version
-        schema_cache.database_version.full_version_string
+        database_version.full_version_string
       end
 
       def get_full_version

Diff for: lib/arjdbc/mysql/adapter.rb

@@ -745,6 +745,12 @@ def jdbc_connection_class
       end
     end
 
+    # NOTE: include these modules before all then override some methods with the
+    # ones defined in ArJdbc::SQLite3 java part and ArJdbc::Abstract
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
+
     include ArJdbc::Abstract::Core
     include ArJdbc::SQLite3
     include ArJdbc::SQLite3Config
@@ -754,9 +760,6 @@ def jdbc_connection_class
     include ArJdbc::Abstract::StatementCache
     include ArJdbc::Abstract::TransactionSupport
 
-    include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
-    include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
-    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
 
     ##
     # :singleton-method:

Diff for: lib/arjdbc/sqlite3/adapter.rb

@@ -473,16 +473,26 @@ public IRubyObject execute_batch2(ThreadContext context, IRubyObject statementsA
         // Assume we will only call this with an array.
         final RubyArray statements = (RubyArray) statementsArg;
         return withConnection(context, connection -> {
+            final Ruby runtime = context.runtime;
+
             Statement statement = null;
+
             try {
                 statement = createStatement(context, connection);
 
                 int length = statements.getLength();
                 for (int i = 0; i < length; i++) {
                     statement.addBatch(sqlString(statements.eltOk(i)));
                 }
-                statement.executeBatch();
-                return context.nil;
+
+                int[] rows = statement.executeBatch();
+
+                RubyArray rowsAffected = runtime.newArray();
+
+                for (int i = 0; i < rows.length; i++) {
+                    rowsAffected.append(runtime.newFixnum(rows[i]));
+                }
+                return rowsAffected;
             } catch (final SQLException e) {
                 // Generate list semicolon list of statements which should match AR error formatting more.
                 debugErrorSQL(context, sqlString(statements.join(context, context.runtime.newString(";\n"))));

Diff for: src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

@@ -6,12 +6,12 @@ class StatementEscapingTest < Test::Unit::TestCase
 
   def setup
     super
-    ActiveRecord::Base.clear_active_connections!
+    ActiveRecord::Base.connection_handler.clear_active_connections!
     @config = current_connection_config.dup
   end
 
   def teardown
-    ActiveRecord::Base.clear_active_connections!
+    ActiveRecord::Base.connection_handler.clear_active_connections!
     ActiveRecord::Base.establish_connection @config
     super
   end
@@ -53,4 +53,4 @@ def verify_escaped
     assert_equal 'abcxyz', rs.first['title']
   end
 
-end
+end

Diff for: test/db/mysql/statement_escaping_test.rb

@@ -1 +1 @@
-exclude :test_check_constraints_should_raise_not_implemented, 'test expects newer MySQL version' unless ActiveRecord::Base.connection.supports_check_constraints?
+exclude :test_check_constraints_should_raise_not_implemented, 'test expects newer MySQL version' unless ActiveRecord::Base.lease_connection.supports_check_constraints?

Diff for: test/rails/excludes/mysql2/ActiveRecord/Migration/NoForeignKeySupportTest.rb

@@ -1 +1 @@
-exclude :test_prepared_statement_status_is_thread_and_instance_specific, 'test expects prepared_statements to be off for mysql' if ActiveRecord::Base.connection.prepared_statements
+exclude :test_prepared_statement_status_is_thread_and_instance_specific, 'test expects prepared_statements to be off for mysql' if ActiveRecord::Base.lease_connection.prepared_statements

Diff for: test/rails/excludes/mysql2/ActiveRecord/PreparedStatementStatusTest.rb

@@ -1 +1 @@
-exclude :test_preloading_too_many_ids, "works only with PS, fails in plain AR with MRI too" unless ActiveRecord::Base.connection.prepared_statements
+exclude :test_preloading_too_many_ids, "works only with PS, fails in plain AR with MRI too" unless ActiveRecord::Base.lease_connection.prepared_statements

Diff for: test/rails/excludes/mysql2/EagerLoadingTooManyIdsTest.rb

@@ -5,6 +5,6 @@
 exclude :test_mysql_connection_collation_is_configured, "Issue #884"
 exclude :test_wait_timeout_as_url, 'uses URL format unknown to JDBC driver (i.e. "mysql2:///")'
 
-if ActiveRecord::Base.connection.jdbc_connection(true).java_class.name.start_with?('org.mariadb.jdbc')
-  exclude :test_mysql_strict_mode_specified_default, 'MariaDB driver reports more options'
-end
+# if ActiveRecord::Base.connection.jdbc_connection(true).java_class.name.start_with?('org.mariadb.jdbc')
+#   exclude :test_mysql_strict_mode_specified_default, 'MariaDB driver reports more options'
+# end

Diff for: test/rails/excludes/mysql2/Mysql2ConnectionTest.rb

@@ -36,7 +36,7 @@ def teardown
   MyObject = Struct.new :attribute1, :attribute2
 
   def test_serialized_attribute
-    Topic.serialize("content", MyObject)
+    Topic.serialize("content", type: MyObject)
 
     myobj = MyObject.new('value1', 'value2')
     topic = Topic.create("content" => myobj)
@@ -47,7 +47,7 @@ def test_serialized_attribute
   end
 
   def test_serialized_attribute_in_base_class
-    Topic.serialize("content", Hash)
+    Topic.serialize("content", type: Hash)
 
     hash = { 'content1' => 'value1', 'content2' => 'value2' }
     important_topic = ImportantTopic.create("content" => hash)
@@ -81,7 +81,7 @@ def test_serialized_attribute_in_base_class
 #  end
 
   def test_serialized_ostruct
-    Topic.serialize :content, OpenStruct
+    Topic.serialize(:content, type: OpenStruct)
 
     t = Topic.new
     t.content.foo = 'bar'
@@ -142,28 +142,28 @@ def test_nil_not_serialized_with_class_constraint
   end
 
   def test_serialized_attribute_should_raise_exception_on_new_with_wrong_type
-    Topic.serialize(:content, Hash)
+    Topic.serialize(:content, type: Hash)
     assert_raise(ActiveRecord::SerializationTypeMismatch) { Topic.new(:content => "string") }
   end
 
   def test_should_raise_exception_on_serialized_attribute_with_type_mismatch
     myobj = MyObject.new('value1', 'value2')
     topic = Topic.new(:content => myobj)
     assert topic.save
-    Topic.serialize(:content, Hash)
+    Topic.serialize(:content, type: Hash)
     assert_raise(ActiveRecord::SerializationTypeMismatch) { Topic.find(topic.id).content }
   end
 
   def test_serialized_attribute_with_class_constraint
     settings = { "color" => "blue" }
-    Topic.serialize(:content, Hash)
+    Topic.serialize(:content, type: Hash)
     topic = Topic.new(:content => settings)
     assert topic.save
     assert_equal(settings, Topic.find(topic.id).content)
   end
 
   def test_serialized_default_class
-    Topic.serialize(:content, Hash)
+    Topic.serialize(:content, type: Hash)
     topic = Topic.new
     assert_equal Hash, topic.content.class
     assert_equal Hash, topic.read_attribute(:content).class
@@ -206,7 +206,7 @@ def self.load(value)
       end
     end
 
-    Topic.serialize(:content, some_class)
+    Topic.serialize(:content, coder: some_class)
     topic = Topic.new(:content => some_class.new('my value'))
     topic.save!
     topic.reload
@@ -216,7 +216,7 @@ def self.load(value)
 
   def test_serialize_attribute_via_select_method_when_time_zone_available
     ActiveRecord::Base.time_zone_aware_attributes = true
-    Topic.serialize(:content, MyObject)
+    Topic.serialize(:content, type: MyObject)
 
     myobj = MyObject.new('value1', 'value2')
     topic = Topic.create(:content => myobj)

Diff for: test/serialize.rb

@@ -84,8 +84,9 @@ def connection
   end
 
   def schema_dump
+    pool = ActiveRecord::Base.connection_pool
     strio = StringIO.new
-    ActiveRecord::SchemaDumper::dump(connection, strio)
+    ActiveRecord::SchemaDumper.dump(pool, strio)
     strio.string
   end
 
@@ -165,7 +166,9 @@ def self.current_connection_config
     ActiveRecord::Base.connection.pool.db_config.configuration_hash
   end
 
-  def current_connection_config; self.class.current_connection_config; end
+  def current_connection_config
+    self.class.current_connection_config
+  end
 
   def deprecation_silence(&block)
     ActiveSupport::Deprecation.silence(&block)