Merge branch 'master' into fully-qualified-path

Author: teoljungberg

Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 gem "bundler", ">= 1.5"
-gem "database_cleaner"
 gem "pg"
 gem "pry"
 gem "rake"

spec/acceptance_helper.rb

@@ -5,7 +5,11 @@
 RSpec.configure do |config|
   config.around(:each) do |example|
     Dir.chdir("spec/dummy") do
+      DatabaseReset.call
+
       example.run
+
+      DatabaseReset.call
     end
   end
 
@@ -24,6 +28,7 @@
   config.after(:suite) do
     Dir.chdir("spec/dummy") do
       ActiveRecord::Base.connection.disconnect!
+      DatabaseReset.call
       system [
         "git add -A",
         "git reset --hard HEAD 1>/dev/null",

spec/dummy/config/application.rb

@@ -12,10 +12,6 @@ class Application < Rails::Application
     config.eager_load = false
     config.active_support.deprecation = :stderr
 
-    config.load_defaults 7.0
-
-    if Rails.version >= "8.0"
-      config.active_support.to_time_preserves_timezone = :zone
-    end
+    config.load_defaults 7.2
   end
 end

spec/fx/schema_dumper_spec.rb

@@ -155,7 +155,7 @@
     expect(output.scan("create_trigger :test_public_trigger").size).to eq(1)
     expect(output.scan("create_function :test_schema_func").size).to eq(1)
     expect(output.scan("create_trigger :test_schema_trigger").size).to eq(1)
-
+  ensure
     connection.schema_search_path = "public"
   end
 

spec/spec_helper.rb

@@ -1,5 +1,4 @@
 ENV["RAILS_ENV"] = "test"
-require "database_cleaner"
 
 require File.expand_path("../dummy/config/environment", __FILE__)
 Dir["spec/support/**/*.rb"].sort.each { |file| load file }
@@ -11,14 +10,20 @@
   config.order = "random"
   config.disable_monkey_patching!
 
-  DatabaseCleaner.strategy = :transaction
+  config.define_derived_metadata(file_path: %r{spec/(fx|features)/}) do |metadata|
+    metadata[:db] = true
+  end
+
+  config.before(:suite) do
+    DatabaseReset.call
+  end
 
   config.around(:each, db: true) do |example|
-    ActiveRecord::Base.connection.execute("SET search_path TO DEFAULT;")
+    DatabaseReset.call
 
-    DatabaseCleaner.start
     example.run
-    DatabaseCleaner.clean
+
+    DatabaseReset.call
   end
 
   unless defined?(silence_stream)

spec/support/database_reset.rb

@@ -0,0 +1,24 @@
+module DatabaseReset
+  def self.call
+    connection = ActiveRecord::Base.connection
+    connection.execute("SET search_path TO DEFAULT;")
+
+    connection.execute <<~SQL
+      DO $$
+      DECLARE
+        schema_name TEXT;
+      BEGIN
+        FOR schema_name IN
+          SELECT nspname FROM pg_namespace
+          WHERE nspname NOT LIKE 'pg_%'
+            AND nspname != 'information_schema'
+        LOOP
+          EXECUTE format('DROP SCHEMA IF EXISTS %I CASCADE', schema_name);
+        END LOOP;
+      END $$;
+    SQL
+
+    connection.execute("CREATE SCHEMA public;")
+    connection.schema_search_path = "public"
+  end
+end