Merge pull request #1000 from dr-itz/52-dev

52.x fixes

Author: enebo

.travis.yml

@@ -92,9 +92,9 @@ matrix:
         mariadb: '10.1'
       env: DB=mariadb PREPARED_STATEMENTS=true
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.2" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.2" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.2" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.2" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.2" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.2.2"
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" DRIVER=MariaDB
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS on by default
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=false
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.2.3"

Gemfile

@@ -52,8 +52,7 @@ end
 
 group :rails do
   group :test do
-    # FIX: Our test suite isn't ready to run in random order yet.
-    gem 'minitest', '< 5.3.4', require: nil
+    gem 'minitest', '~> 5.11.3', require: nil
     gem 'minitest-excludes', '~> 2.0.1', require: nil
     gem 'minitest-rg', require: nil
 

lib/arjdbc/postgresql/oid_types.rb

@@ -33,12 +33,6 @@ def extensions
         @extensions ||= super
       end
 
-      # @override
-      def lookup_cast_type(sql_type)
-        oid = execute("SELECT #{quote(sql_type)}::regtype::oid", "SCHEMA")
-        super oid.first['oid'].to_i
-      end
-
       def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
         if !type_map.key?(oid)
           load_additional_types([oid])

test/db/sqlite3/schema_dump_test.rb

@@ -10,6 +10,8 @@ def test_excludes_sqlite_sequence
   end
 
   def test_dumping_with_dot_in_table_name
+    pend 'in recent Rails version, a.b means database table "b" in database "a". Delete test?'
+
     connection.create_table('test.some_records') { |t| t.string :name }
     connection.add_index('test.some_records', :name, :unique => true)
     assert_equal 2, connection.columns('test.some_records').size
@@ -23,4 +25,4 @@ def test_dumping_with_dot_in_table_name
     end
   end
 
-end
+end

test/rails/excludes/mysql2/EagerLoadingTooManyIdsTest.rb

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

test/rails/excludes/postgresql/EagerLoadingTooManyIdsTest.rb

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