foreign_key_checker 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b355b8130d2225136101b32202f457ee9615c33621730fa693fcbcb969af3fcf
-  data.tar.gz: ee8b977be65abc39da0914c804f612bb2fb2a33a98a46c922eedde3866147da1
+  metadata.gz: 61d367175ce6fba75c746ebc5425f463c20d903e31885edd04e407a100dbe72e
+  data.tar.gz: 1a6cb3b2f4d0123e884f432a7d6a4c48acf2d9e16a7fb3439ddfd4f06df198db
 SHA512:
-  metadata.gz: 8f34d020417ddcaefc15a6faec34ffb495f6383157104b660f28013f85a57d8a390cee15c47613ffed64a884ffc581c4c0c5557c97a36d9e2fadf0ff54021d7a
-  data.tar.gz: a4b0f8032dc6adc78f4780c7c939acc661bb2e9dde713cddee43a5080f59e2882a1433550964f26abb4120491752a83e596f5cc37821561c6ba118cd52f2ad16
+  metadata.gz: 0437adb8468a7018a11e77d5e77fec0cd7fcd0b5cf37ccfb8d31a2da35da3ebd4a706a5d373ebb8f50ae91e3e698c73b1cd5cd4e28049b520156e90d9e65b619
+  data.tar.gz: 91f2dda0e5a8036cdc330a673a8d2aaba235435f870b02c99ea828140fca646456d555d979447fc78c3f9174c53ad23ff2c295084588c2f54ac211f606f684ac

data/lib/foreign_key_checker/version.rb

@@ -1,3 +1,3 @@
 module ForeignKeyChecker
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/foreign_key_checker.rb

@@ -1,6 +1,7 @@
 require "foreign_key_checker/railtie"
 
 module ForeignKeyChecker
+  class TypeMismatch < StandardError; end
   class Result
     attr_reader :model, :association
     def initialize(data)
@@ -34,6 +35,11 @@ module ForeignKeyChecker
     def inspect
       "#<#{self.class.name}:#{self.object_id} #{message}>"
     end
+
+    def nullable?
+      model.columns_hash[from_column.to_s].null
+    end
+
   end
 
   class ForeignKeyResult < Result
@@ -152,6 +158,12 @@ module ForeignKeyChecker
 
     end
 
+    def check_types(model, association)
+      type_from = model.columns_hash[association.foreign_key.to_s].sql_type
+      type_to = association.klass.columns_hash[association.klass.primary_key.to_s].sql_type
+      raise TypeMismatch, "TypeMissMatch #{type_from} != #{type_to}" if type_from != type_to
+    end
+
     def check_foreign_key_bt_association(model, association)
       return if model.name.starts_with?('HABTM_')
       related = association.klass
@@ -161,6 +173,8 @@ module ForeignKeyChecker
         "#{related.quoted_table_name}.#{related.quoted_primary_key} IS NULL AND #{model.quoted_table_name}.#{column_name} IS NOT NULL"
       )
 
+      check_types(model, association)
+
       if zombies
         number = scope.count
         if number > 0
@@ -174,6 +188,7 @@ module ForeignKeyChecker
       end
 
       if foreign_keys && !model.connection.foreign_key_exists?(model.table_name, related.table_name)
+        scope.first
         @result[:foreign_keys] << ForeignKeyResult.new(
           model: model,
           association: association,
@@ -187,7 +202,7 @@ module ForeignKeyChecker
           association: association,
         )
       end
-    rescue ActiveRecord::InverseOfAssociationNotFoundError, ActiveRecord::StatementInvalid => error
+    rescue ActiveRecord::InverseOfAssociationNotFoundError, ActiveRecord::StatementInvalid, TypeMismatch => error
       @result[:broken] << BrokenRelationResult.new(
         model: model,
         association: association,

data/lib/generators/foreign_key_checker/migration/migration_generator.rb

@@ -14,7 +14,7 @@ module ForeignKeyChecker
         @done = Dir.glob(Rails.root.join('db', 'migrate', '*.rb')).map do |path|
           File.open(path).readlines.find { |line| line.include?('ActiveRecord::Migration') && line.include?(@class_name) }
         end.compact.size
-        @checks = ForeignKeyChecker.check(zombies: false, indexes: false) unless @behavior == :revoke
+        @checks = ForeignKeyChecker.check(zombies: false) unless @behavior == :revoke
         if @behavior == :revoke
           @file_suffix = "_v#{@done}" if @done > 1
           @class_suffix = "V#{@done}" if @done > 1

data/lib/generators/foreign_key_checker/migration/templates/migrations/fix_foreign_keys.rb.erb

@@ -3,8 +3,13 @@ class <%= @class_name %><%= @class_suffix %> < ActiveRecord::Migration[<%= Activ
 <% @checks[:foreign_keys].each do |fk| %>
     reversible do |dir|
       dir.up do
-        # <%= fk.to_zombie.migration(set_null: true) %>
+<% if fk.nullable? %>
+        # <%= fk.to_zombie.migration %>
+        <%= fk.to_zombie.migration(set_null: true) %>
+<% else %>
+        # column <%= fk.from_column %> can't be set to null
         <%= fk.to_zombie.migration %>
+<% end %>
       end
     end
     <%= fk.migration %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_key_checker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - AnatolyShirykalov