database_consistency 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ce7a52d5ba8e97db7d362d92c6a40df067f6fbab3945aa0f97ec80017ed265
-  data.tar.gz: 52b9314bb94e5664cfe791535596ad1de1055e378a37dd0b9f909d595c633a51
+  metadata.gz: 206fe7e1ee1028de91d489b10d455e21685383c654fbcfbc4d4e2547d602d3f4
+  data.tar.gz: ed3ec0dcdc367e7a666546c5021467d5b30e09675d10db57ef736c3ba608d967
 SHA512:
-  metadata.gz: c72b8c701d2e90e4fd981c27a63b6a1369f10af8c51021006cb78bf19d92f24d280c36cbb4654db8929c3f26069769fa8fd23145c444a2fe565dacadadbed7cc
-  data.tar.gz: 763b0564fe4d78619e5d0ba0245837dbf74634f9480237b1b68f47f04ae5be3dfa2c943aa9da6257ec7b2b6159e1dfef6772a12ca656a3d7de45d916f4c6b10c
+  metadata.gz: 254f03f91c90fc4ee1a079ecd467455be99ad3dedbe3703fb2bf3151b1b17e1d01c3b4bc7eb4db43bea685431ffde768c6c48c0e2e9754358b9157640c3e5592
+  data.tar.gz: 7e8a87dd238595b25a8040d5196d0c214fc61a12f933d708473445e297d87f6d06f84351245dac4588bdd6a4f69abd2c6e48c8a2bce2deef053ac6e98b61d1a3

data/lib/database_consistency/helper.rb

@@ -6,10 +6,10 @@ module DatabaseConsistency
     module_function
 
     def adapter
-      if ActiveRecord::Base.respond_to?(:connection_config)
-        ActiveRecord::Base.connection_config[:adapter]
-      else
+      if ActiveRecord::Base.respond_to?(:connection_db_config)
         ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+      else
+        ActiveRecord::Base.connection_config[:adapter]
       end
     end
 
@@ -18,10 +18,10 @@ module DatabaseConsistency
     end
 
     def connection_config(klass)
-      if klass.respond_to?(:connection_config)
-        klass.connection_config
-      else
+      if klass.respond_to?(:connection_db_config)
         klass.connection_db_config.configuration_hash
+      else
+        klass.connection_config
       end
     end
 

data/lib/database_consistency/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatabaseConsistency
-  VERSION = '1.7.1'
+  VERSION = '1.7.3'
 end

data/lib/database_consistency/writers/autofix/helpers/migration.rb

@@ -15,6 +15,10 @@ module DatabaseConsistency
             "db/migrate/#{version}_#{name.underscore}.rb"
           end
 
+          def migration_path_pattern(name)
+            "db/migrate/*_#{name.underscore}.rb"
+          end
+
           def migration_configuration(name)
             {
               migration_name: name.camelcase,

data/lib/database_consistency/writers/autofix/migration_base.rb

@@ -7,7 +7,13 @@ module DatabaseConsistency
         include Helpers::Migration
 
         def fix!
-          File.write(migration_path(migration_name), migration)
+          file_path = migration_path(migration_name)
+
+          if Dir[migration_path_pattern(migration_name)].any?
+            p "Skipping migration #{migration_name} because it already exists"
+          else
+            File.write(file_path, migration)
+          end
         end
 
         def attributes

data/lib/database_consistency/writers/simple/null_constraint_misses_validator.rb

@@ -7,7 +7,7 @@ module DatabaseConsistency
         private
 
         def template
-          'column is required in the database but do not have presence validator'
+          'column is required in the database but does not have a validator disallowing nil values'
         end
 
         def unique_attributes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord