Merge pull request #1053 from dr-itz/rails61-dev

Rails 6.1 dev

Author: enebo

lib/arjdbc/postgresql/adapter.rb

@@ -503,7 +503,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/sqlite3/adapter.rb

@@ -262,7 +262,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/mysql2/FinderTest.rb

@@ -0,0 +1,9 @@
+#
+# The tests below verify that no query is executed. AR-JDBC doesn't actually execute
+# the queries, but fails during binding the params, just like AR would. The difference
+# is in logging. AR only logs _after_ the binds are setup, AR-JDBC logs the whole
+# block since everything is done in Java...
+#
+exclude :test_find_with_large_number, 'different order in ARJDBC gives false positive'
+exclude :test_find_by_with_large_number, 'different order in ARJDBC gives false positive'
+exclude :test_find_by_id_with_large_number, 'different order in ARJDBC gives false positive'

test/rails/excludes/postgresql/FinderTest.rb

@@ -0,0 +1,9 @@
+#
+# The tests below verify that no query is executed. AR-JDBC doesn't actually execute
+# the queries, but fails during binding the params, just like AR would. The difference
+# is in logging. AR only logs _after_ the binds are setup, AR-JDBC logs the whole
+# block since everything is done in Java...
+#
+exclude :test_find_with_large_number, 'different order in ARJDBC gives false positive'
+exclude :test_find_by_with_large_number, 'different order in ARJDBC gives false positive'
+exclude :test_find_by_id_with_large_number, 'different order in ARJDBC gives false positive'

test/rails/excludes/sqlite3/FinderTest.rb

@@ -0,0 +1,9 @@
+#
+# The tests below verify that no query is executed. AR-JDBC doesn't actually execute
+# the queries, but fails during binding the params, just like AR would. The difference
+# is in logging. AR only logs _after_ the binds are setup, AR-JDBC logs the whole
+# block since everything is done in Java...
+#
+exclude :test_find_with_large_number, 'different order in ARJDBC gives false positive'
+exclude :test_find_by_with_large_number, 'different order in ARJDBC gives false positive'
+exclude :test_find_by_id_with_large_number, 'different order in ARJDBC gives false positive'