Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 25 deletions

diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index b31881e3082..8f706fdebc9 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -17,32 +17,9 @@ RSpec.configure do |config|
     delete_from_all_tables!(except: ['work_item_types'])
 
     # Postgres maximum number of columns in a table is 1600 (https://github.com/postgres/postgres/blob/de41869b64d57160f58852eab20a27f248188135/src/include/access/htup_details.h#L23-L47).
-    # And since:
-    # "The DROP COLUMN form does not physically remove the column, but simply makes
-    # it invisible to SQL operations. Subsequent insert and update operations in the
-    # table will store a null value for the column. Thus, dropping a column is quick
-    # but it will not immediately reduce the on-disk size of your table, as the space
-    # occupied by the dropped column is not reclaimed.
-    # The space will be reclaimed over time as existing rows are updated."
-    # according to https://www.postgresql.org/docs/current/sql-altertable.html.
     # We drop and recreate the database if any table has more than 1200 columns, just to be safe.
-    max_allowed_columns = 1200
-    tables_with_more_than_allowed_columns =
-      ApplicationRecord.connection.execute("SELECT attrelid::regclass::text AS table, COUNT(*) AS column_count FROM pg_attribute GROUP BY attrelid HAVING COUNT(*) > #{max_allowed_columns}")
-
-    if tables_with_more_than_allowed_columns.any?
-      tables_with_more_than_allowed_columns.each do |result|
-        puts "The #{result['table']} table has #{result['column_count']} columns."
-      end
-      puts "Recreating the database"
-      start = Gitlab::Metrics::System.monotonic_time
-
-      ActiveRecord::Tasks::DatabaseTasks.drop_current
-      ActiveRecord::Tasks::DatabaseTasks.create_current
-      ActiveRecord::Tasks::DatabaseTasks.load_schema_current
-      ActiveRecord::Tasks::DatabaseTasks.migrate
-
-      puts "Database re-creation done in #{Gitlab::Metrics::System.monotonic_time - start}"
+    if any_connection_class_with_more_than_allowed_columns?
+      recreate_all_databases!
     end
   end