Merge pull request #1056 from dr-itz/rails6-dev

Rails 6.0 fixes

Author: enebo

lib/arjdbc/postgresql/adapter.rb

@@ -512,7 +512,7 @@ def quote_table_name(name)
     alias_method :quote_schema_name, :quote_column_name
 
     # Need to clear the cache even though the AR adapter doesn't for some reason
-    def remove_column(table_name, column_name, type = nil, options = {})
+    def remove_column(table_name, column_name, type = nil, **options)
       super
       clear_cache!
     end

lib/arjdbc/postgresql/oid_types.rb

@@ -213,7 +213,7 @@ def load_additional_types(type_map, oid = nil) # :nodoc:
         if oid
           if oid.is_a? Numeric || oid.match(/^\d+$/)
             # numeric OID
-            query += "WHERE t.oid::integer = %s" % oid
+            query += "WHERE t.oid = %s" % oid
 
           elsif m = oid.match(/"?(\w+)"?\."?(\w+)"?/)
             # namespace and type name

lib/arjdbc/sqlite3/adapter.rb

@@ -229,7 +229,7 @@ def add_column(table_name, column_name, type, options = {}) #:nodoc:
       end
     end
 
-    def remove_column(table_name, column_name, type = nil, options = {}) #:nodoc:
+    def remove_column(table_name, column_name, type = nil, **options) #:nodoc:
       alter_table(table_name) do |definition|
         definition.remove_column column_name
         definition.foreign_keys.delete_if do |_, fk_options|

test/rails/excludes/postgresql/ActiveRecord/PostgresqlTransactionTest.rb

@@ -0,0 +1 @@
+exclude :test_raises_SerializationFailure_when_a_serialization_failure_occurs, 'hangs sometimes'

test/rails/excludes/postgresql/PostgresqlJSONBTest.rb

@@ -0,0 +1,3 @@
+if ActiveRecord::Base.connection.database_version < 90500
+  exclude :test_pretty_print, 'fails with PG < 9.5'
+end