Merge pull request rails#37505 from dr-itz/fix/6-0-tests

activerecord: fix some test failers caused by recent backports

Author: kamipo

activerecord/test/cases/arel/attributes_test.rb

@@ -27,40 +27,40 @@ module Arel
     describe "for" do
       it "deals with unknown column types" do
         column = Struct.new(:type).new :crazy
-        Attributes.for(column).must_equal Attributes::Undefined
+        _(Attributes.for(column)).must_equal Attributes::Undefined
       end
 
       it "returns the correct constant for strings" do
         [:string, :text, :binary].each do |type|
           column = Struct.new(:type).new type
-          Attributes.for(column).must_equal Attributes::String
+          _(Attributes.for(column)).must_equal Attributes::String
         end
       end
 
       it "returns the correct constant for ints" do
         column = Struct.new(:type).new :integer
-        Attributes.for(column).must_equal Attributes::Integer
+        _(Attributes.for(column)).must_equal Attributes::Integer
       end
 
       it "returns the correct constant for floats" do
         column = Struct.new(:type).new :float
-        Attributes.for(column).must_equal Attributes::Float
+        _(Attributes.for(column)).must_equal Attributes::Float
       end
 
       it "returns the correct constant for decimals" do
         column = Struct.new(:type).new :decimal
-        Attributes.for(column).must_equal Attributes::Decimal
+        _(Attributes.for(column)).must_equal Attributes::Decimal
       end
 
       it "returns the correct constant for boolean" do
         column = Struct.new(:type).new :boolean
-        Attributes.for(column).must_equal Attributes::Boolean
+        _(Attributes.for(column)).must_equal Attributes::Boolean
       end
 
       it "returns the correct constant for time" do
         [:date, :datetime, :timestamp, :time].each do |type|
           column = Struct.new(:type).new type
-          Attributes.for(column).must_equal Attributes::Time
+          _(Attributes.for(column)).must_equal Attributes::Time
         end
       end
     end

activerecord/test/cases/test_case.rb

@@ -113,7 +113,7 @@ def clear_log; self.log = []; self.log_all = []; end
     # ignored SQL, or better yet, use a different notification for the queries
     # instead examining the SQL content.
     oracle_ignored     = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im, /^\s*select .* from all_constraints/im, /^\s*select .* from all_tab_cols/im, /^\s*select .* from all_sequences/im]
-    mysql_ignored      = [/^SHOW FULL TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /, /^\s*SELECT (?:column_name|table_name)\b.*\bFROM information_schema\.(?:key_column_usage|tables)\b/im]
+    mysql_ignored      = [/^SHOW FULL TABLES/i, /^SHOW FULL FIELDS/, /^SHOW CREATE TABLE /i, /^SHOW VARIABLES /, /^\s*SELECT (?:column_name|table_name)\b.*\bFROM information_schema\.(?:key_column_usage|tables|statistics)\b/im]
     postgresql_ignored = [/^\s*select\b.*\bfrom\b.*pg_namespace\b/im, /^\s*select tablename\b.*from pg_tables\b/im, /^\s*select\b.*\battname\b.*\bfrom\b.*\bpg_attribute\b/im, /^SHOW search_path/i, /^\s*SELECT\b.*::regtype::oid\b/im]
     sqlite3_ignored =    [/^\s*SELECT name\b.*\bFROM sqlite_master/im, /^\s*SELECT sql\b.*\bFROM sqlite_master/im]