database_cleaner-active_record 2.0.0.beta2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53199df54296cd17b30bf241e2ca431323b7bef7c4361240f63a682be6d02ee9
-  data.tar.gz: 668c5fbe4726841ff27034bcf81de0f98c6ba9494aa2a0cb3fcbade1bfb63d74
+  metadata.gz: e2c9c7514dc1bea223af68a8a3822b1fb07e227911897166432f6018ab5b23a9
+  data.tar.gz: b3217f7ad1128617b17be1872207df59317204aa7912bca0a00e0aab77490d15
 SHA512:
-  metadata.gz: 253bced62511194095bef9671ed30602be05d2c417ba39e79dd7b2df7b58f5f602551ccd53c91ad451746bfb9e6086e107818d089c0b37256e4035098bb10fdf
-  data.tar.gz: 5a4b22a83f03b8064b77e966c277ae9ebc98ff9ca44c0bb229df817a6b21fc0853b454f7307ae195e4184281f0f6e4d2bfc207b2845fe95e358488c90de70f92
+  metadata.gz: 74e5baa1c2eb6de6b39213d9d192dcb649ff069d8ac5a9ad3d9347beb40b68a15c29a16149e2338098d246db3fdb6a7a22baef9911f4be5fb1954560d87e2b81
+  data.tar.gz: 991af4358084057df8efd4a05d7fa0eb75756ee8f940a7f2bd2e2da2a65a64a1bd96f668c355948e16b04c33b407276d2076f5bec5b47631e6682dd0a5221408

data/.travis.yml

@@ -10,6 +10,7 @@ gemfile:
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
 before_install:
   - bin/setup
 cache:

data/Appraisals

@@ -9,3 +9,7 @@ end
 appraise "rails-6.0" do
   gem "rails", "~>6.0.0"
 end
+
+appraise "rails-6.1" do
+  gem "rails", "~>6.1.0"
+end

data/README.md

@@ -73,8 +73,8 @@ DatabaseCleaner[:active_record].db = :logs
 DatabaseCleaner[:active_record].db = :default
 
 # Multiple databases can be specified:
-DatabaseCleaner[:active_record, connection: :default]
-DatabaseCleaner[:active_record, connection: :logs]
+DatabaseCleaner[:active_record, db: :default]
+DatabaseCleaner[:active_record, db: :logs]
 ```
 
 ## Common Errors

data/database_cleaner-active_record.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "database_cleaner-core", "~>2.0.0.beta2"
-  spec.add_dependency "activerecord"
+  spec.add_dependency "database_cleaner-core", "~>2.0.0"
+  spec.add_dependency "activerecord", ">= 5.a"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "appraisal"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "rails", "~>6.1.0"
+gem "byebug"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

data/lib/database_cleaner/active_record/base.rb

@@ -45,26 +45,32 @@ module DatabaseCleaner
       private
 
       def load_config
-        if self.db != :default && self.db.is_a?(Symbol) && File.file?(DatabaseCleaner::ActiveRecord.config_file_location)
+        if db != :default && db.is_a?(Symbol) && File.file?(DatabaseCleaner::ActiveRecord.config_file_location)
           connection_details = YAML::load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result)
-          @connection_hash   = valid_config(connection_details)[self.db.to_s]
+          @connection_hash   = valid_config(connection_details, db.to_s)
         end
       end
 
-      def valid_config(connection_file)
-        if !::ActiveRecord::Base.configurations.nil? && !::ActiveRecord::Base.configurations.empty?
-          if connection_file != ::ActiveRecord::Base.configurations
-            return ::ActiveRecord::Base.configurations
-          end
+      def valid_config(connection_file, db)
+        return connection_file[db] unless (active_record_config_hash = active_record_config_hash_for(db))
+
+        active_record_config_hash
+      end
+
+      def active_record_config_hash_for(db)
+        if ::ActiveRecord.version >= Gem::Version.new('6.1')
+          ::ActiveRecord::Base.configurations&.configs_for(name: db)&.configuration_hash
+        else
+          ::ActiveRecord::Base.configurations[db]
         end
-        connection_file
       end
 
       def lookup_from_connection_pool
-        if ::ActiveRecord::Base.respond_to?(:descendants)
-          database_name = connection_hash["database"] || connection_hash[:database]
-          models        = ::ActiveRecord::Base.descendants
-          models.select(&:connection_pool).detect { |m| m.connection_pool.spec.config[:database] == database_name }
+        return unless ::ActiveRecord::Base.respond_to?(:descendants)
+
+        database_name = connection_hash['database'] || connection_hash[:database]
+        ::ActiveRecord::Base.descendants.select(&:connection_pool).detect do |model|
+          database_for(model) == database_name
         end
       end
 
@@ -72,6 +78,14 @@ module DatabaseCleaner
         ::ActiveRecord::Base.establish_connection(connection_hash)
         ::ActiveRecord::Base
       end
+
+      def database_for(model)
+        if model.connection_pool.respond_to?(:db_config) # ActiveRecord >= 6.1
+          model.connection_pool.db_config.configuration_hash[:database]
+        else
+          model.connection_pool.spec.config[:database]
+        end
+      end
     end
   end
 end

data/lib/database_cleaner/active_record/version.rb

@@ -1,5 +1,5 @@
 module DatabaseCleaner
   module ActiveRecord
-    VERSION = "2.0.0.beta2"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_cleaner-active_record
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ernesto Tagwerker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner-core
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.a
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ files:
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/database_cleaner-active_record.rb
 - lib/database_cleaner/active_record.rb
 - lib/database_cleaner/active_record/base.rb
@@ -183,9 +184,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: