Merge pull request rails#47499 from fatkodima/activerecord-tests-speedup

Speedup activerecord tests

Author: guilleiguaran

activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb

@@ -160,8 +160,12 @@ def build_explain_clause(options = [])
         end
 
         private
+          IDLE_TRANSACTION_STATUSES = [PG::PQTRANS_IDLE, PG::PQTRANS_INTRANS, PG::PQTRANS_INERROR]
+          private_constant :IDLE_TRANSACTION_STATUSES
+
           def cancel_any_running_query
-            return unless @raw_connection && @raw_connection.transaction_status != PG::PQTRANS_IDLE
+            return if @raw_connection.nil? || IDLE_TRANSACTION_STATUSES.include?(@raw_connection.transaction_status)
+
             @raw_connection.cancel
             @raw_connection.block
           rescue PG::Error

activerecord/lib/active_record/schema_dumper.rb

@@ -65,6 +65,11 @@ def initialize(connection, options = {})
         @connection = connection
         @version = connection.migration_context.current_version rescue nil
         @options = options
+        @ignore_tables = [
+          ActiveRecord::Base.schema_migrations_table_name,
+          ActiveRecord::Base.internal_metadata_table_name,
+          self.class.ignore_tables
+        ].flatten
       end
 
       # turns 20170404131909 into "2017_04_04_131909"
@@ -317,7 +322,7 @@ def remove_prefix_and_suffix(table)
       end
 
       def ignored?(table_name)
-        [ActiveRecord::Base.schema_migrations_table_name, ActiveRecord::Base.internal_metadata_table_name, ignore_tables].flatten.any? do |ignored|
+        @ignore_tables.any? do |ignored|
           ignored === remove_prefix_and_suffix(table_name)
         end
       end

activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb

@@ -414,6 +414,8 @@ def test_does_not_raise_note_level_warnings
   end
 
   def test_warnings_do_not_change_returned_value_of_exec_update
+    previous_logger = ActiveRecord::Base.logger
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(nil)
     ActiveRecord.db_warnings_action = :log
 
     # Mysql2 will raise an error when attempting to perform an update that warns if the sql_mode is set to strict
@@ -426,10 +428,13 @@ def test_warnings_do_not_change_returned_value_of_exec_update
     assert_equal 1, result
   ensure
     @conn.execute("SET @@SESSION.sql_mode='#{old_sql_mode}'")
+    ActiveRecord::Base.logger = previous_logger
     ActiveRecord.db_warnings_action = @original_db_warnings_action
   end
 
   def test_warnings_do_not_change_returned_value_of_exec_delete
+    previous_logger = ActiveRecord::Base.logger
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(nil)
     ActiveRecord.db_warnings_action = :log
 
     # Mysql2 will raise an error when attempting to perform a delete that warns if the sql_mode is set to strict
@@ -442,6 +447,7 @@ def test_warnings_do_not_change_returned_value_of_exec_delete
     assert_equal 1, result
   ensure
     @conn.execute("SET @@SESSION.sql_mode='#{old_sql_mode}'")
+    ActiveRecord::Base.logger = previous_logger
     ActiveRecord.db_warnings_action = @original_db_warnings_action
   end
 

activerecord/test/cases/adapters/postgresql/create_unlogged_tables_test.rb

@@ -18,13 +18,14 @@ class Thing < ActiveRecord::Base
   end
 
   def setup
+    @previous_unlogged_tables = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables
     @connection = ActiveRecord::Base.connection
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables = false
   end
 
   teardown do
     @connection.drop_table TABLE_NAME, if_exists: true
-    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables = false
+    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables = @previous_unlogged_tables
   end
 
   def test_logged_by_default

activerecord/test/cases/adapters/postgresql/enum_test.rb

@@ -101,7 +101,7 @@ def test_assigning_enum_to_nil
   def test_schema_dump
     @connection.add_column "postgresql_enums", "good_mood", :mood, default: "happy", null: false
 
-    output = dump_all_table_schema
+    output = dump_table_schema("postgresql_enums")
 
     assert_includes output, "# Note that some types may not work with other database engines. Be careful if changing database."
 

activerecord/test/cases/batches_test.rb

@@ -92,9 +92,14 @@ def test_each_should_execute_if_id_is_in_select
   end
 
   def test_warn_if_order_scope_is_set
+    previous_logger = ActiveRecord::Base.logger
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(nil)
+
     assert_called(ActiveRecord::Base.logger, :warn) do
       Post.order("title").find_each { |post| post }
     end
+  ensure
+    ActiveRecord::Base.logger = previous_logger
   end
 
   def test_logger_not_required

activerecord/test/cases/fixtures_test.rb

@@ -440,9 +440,14 @@ def test_insert_with_datetime
   end
 
   def test_logger_level_invariant
+    previous_logger = ActiveRecord::Base.logger
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(nil)
+
     level = ActiveRecord::Base.logger.level
     create_fixtures("topics")
     assert_equal level, ActiveRecord::Base.logger.level
+  ensure
+    ActiveRecord::Base.logger = previous_logger
   end
 
   def test_instantiation

activerecord/test/cases/helper.rb

@@ -11,6 +11,10 @@
 require "active_support/core_ext/kernel/reporting"
 require "active_support/core_ext/kernel/singleton_class"
 
+if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.create_unlogged_tables = true
+end
+
 # TODO: Move all these random hacks into the ARTest namespace and into the support/ dir
 
 Thread.abort_on_exception = true

activerecord/test/cases/schema_dumper_test.rb

@@ -150,7 +150,7 @@ def test_schema_dump_includes_limit_constraint_for_integer_columns
   end
 
   def test_schema_dump_with_string_ignored_table
-    output = dump_all_table_schema(["accounts"])
+    output = dump_table_schema("authors")
     assert_no_match %r{create_table "accounts"}, output
     assert_match %r{create_table "authors"}, output
     assert_no_match %r{create_table "schema_migrations"}, output
@@ -350,13 +350,13 @@ def test_schema_dump_includes_extensions
       connection = ActiveRecord::Base.connection
 
       connection.stub(:extensions, ["hstore"]) do
-        output = dump_all_table_schema
+        output = dump_all_table_schema(/./)
         assert_match "# These are extensions that must be enabled", output
         assert_match %r{enable_extension "hstore"}, output
       end
 
       connection.stub(:extensions, []) do
-        output = dump_all_table_schema
+        output = dump_all_table_schema(/./)
         assert_no_match "# These are extensions that must be enabled", output
         assert_no_match %r{enable_extension}, output
       end
@@ -366,13 +366,13 @@ def test_schema_dump_includes_extensions_in_alphabetic_order
       connection = ActiveRecord::Base.connection
 
       connection.stub(:extensions, ["hstore", "uuid-ossp", "xml2"]) do
-        output = dump_all_table_schema
+        output = dump_all_table_schema(/./)
         enabled_extensions = output.scan(%r{enable_extension "(.+)"}).flatten
         assert_equal ["hstore", "uuid-ossp", "xml2"], enabled_extensions
       end
 
       connection.stub(:extensions, ["uuid-ossp", "xml2", "hstore"]) do
-        output = dump_all_table_schema
+        output = dump_all_table_schema(/./)
         enabled_extensions = output.scan(%r{enable_extension "(.+)"}).flatten
         assert_equal ["hstore", "uuid-ossp", "xml2"], enabled_extensions
       end
@@ -457,7 +457,7 @@ def test_schema_dump_with_table_name_prefix_and_suffix
     migration = CreateDogMigration.new
     migration.migrate(:up)
 
-    output = dump_all_table_schema
+    output = dump_table_schema("dog_owners", "dogs")
     assert_no_match %r{create_table "foo_.+_bar"}, output
     assert_no_match %r{add_index "foo_.+_bar"}, output
     assert_no_match %r{create_table "schema_migrations"}, output
@@ -482,7 +482,7 @@ def test_schema_dump_with_table_name_prefix_and_suffix_regexp_escape
     migration = CreateDogMigration.new
     migration.migrate(:up)
 
-    output = dump_all_table_schema
+    output = dump_table_schema("dog_owners", "dog")
     assert_no_match %r{create_table "foo\$.+\$bar"}, output
     assert_no_match %r{add_index "foo\$.+\$bar"}, output
     assert_no_match %r{create_table "schema_migrations"}, output
@@ -550,7 +550,7 @@ def down
       end
       migration.migrate(:up)
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.datetime "this_should_remain_datetime"')
       assert output.include?('t.datetime "this_is_an_alias_of_datetime"')
       assert output.include?('t.datetime "without_time_zone"')
@@ -579,7 +579,7 @@ def down
         end
         migration.migrate(:up)
 
-        output = dump_all_table_schema
+        output = dump_table_schema("timestamps")
         assert output.include?('t.datetime "this_should_remain_datetime"')
         assert output.include?('t.datetime "this_is_an_alias_of_datetime"')
         assert output.include?('t.timestamp "without_time_zone"')
@@ -607,7 +607,7 @@ def down
       end
       migration.migrate(:up)
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.datetime "this_should_remain_datetime"')
       assert output.include?('t.datetime "this_is_an_alias_of_datetime"')
       assert output.include?('t.datetime "this_is_also_an_alias_of_datetime"')
@@ -634,7 +634,7 @@ def down
         end
         migration.migrate(:up)
 
-        output = dump_all_table_schema
+        output = dump_table_schema("timestamps")
         # Normally we'd write `t.datetime` here. But because you've changed the `datetime_type`
         # to something else, `t.datetime` now means `:timestamptz`. To ensure that old columns
         # are still created as a `:timestamp` we need to change what is written to the schema dump.
@@ -668,15 +668,15 @@ def down
       end
       migration.migrate(:up)
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.datetime "default_format"')
       assert output.include?('t.datetime "without_time_zone"')
       assert output.include?('t.timestamptz "with_time_zone"')
 
       datetime_type_was = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.datetime_type
       ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.datetime_type = :timestamptz
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.timestamp "default_format"')
       assert output.include?('t.timestamp "without_time_zone"')
       assert output.include?('t.datetime "with_time_zone"')
@@ -704,7 +704,7 @@ def down
       end
       migration.migrate(:up)
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.datetime "default_format"')
       assert output.include?('t.datetime "without_time_zone"')
       assert output.include?('t.datetime "also_without_time_zone"')
@@ -732,7 +732,7 @@ def down
       end
       migration.migrate(:up)
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.datetime "default_format"')
       assert output.include?('t.datetime "without_time_zone"')
       assert output.include?('t.datetime "also_without_time_zone"')
@@ -759,7 +759,7 @@ def down
       end
       migration.migrate(:up)
 
-      output = dump_all_table_schema
+      output = dump_table_schema("timestamps")
       assert output.include?('t.datetime "default_format"')
       assert output.include?('t.datetime "without_time_zone"')
       assert output.include?('t.datetime "also_without_time_zone"')
@@ -785,7 +785,7 @@ def down
         end
         migration.migrate(:up)
 
-        output = dump_all_table_schema
+        output = dump_table_schema("timestamps")
         # Normally we'd write `t.datetime` here. But because you've changed the `datetime_type`
         # to something else, `t.datetime` now means `:timestamptz`. To ensure that old columns
         # are still created as a `:timestamp` we need to change what is written to the schema dump.
@@ -818,7 +818,7 @@ def down
         end
         migration.migrate(:up)
 
-        output = dump_all_table_schema
+        output = dump_table_schema("timestamps")
         # Normally we'd write `t.datetime` here. But because you've changed the `datetime_type`
         # to something else, `t.datetime` now means `:timestamptz`. To ensure that old columns
         # are still created as a `:timestamp` we need to change what is written to the schema dump.

activerecord/test/support/connection.rb

@@ -21,7 +21,11 @@ def self.test_configuration_hashes
   def self.connect
     ActiveRecord.async_query_executor = :global_thread_pool
     puts "Using #{connection_name}"
-    ActiveRecord::Base.logger = ActiveSupport::Logger.new("debug.log", 1, 100 * 1024 * 1024)
+    if ENV["CI"]
+      ActiveRecord::Base.logger = nil
+    else
+      ActiveRecord::Base.logger = ActiveSupport::Logger.new("debug.log", 1, 100 * 1024 * 1024)
+    end
     ActiveRecord::Base.configurations = test_configuration_hashes
     ActiveRecord::Base.establish_connection :arunit
     ARUnit2Model.establish_connection :arunit2