Fix missing Dirty methods not being generated

lib/vault/active_record/associations/join_dependency/join_part.rb

@@ -0,0 +1,24 @@
+require 'active_record'
+# Force ther original JoinPart to load
+require 'active_record/associations/join_dependency/join_part'
+
+module ActiveRecord
+  module Associations
+    class JoinDependency
+      class JoinPart
+        # Prevent virtual attributes from being included in JOIN sql queries.
+        # This will work with both ActiveRecord 4 an 5 because in the original
+        # implementation this methos is delegated to the base class - the model.
+        def column_names
+          column_names = base_klass.column_names
+
+          if base_klass.methods.include? :persistable_attribute_names
+            column_names = column_names & base_klass.persistable_attribute_names
+          end
+
+          column_names
+        end
+      end
+    end
+  end
+end

lib/vault/encrypted_model.rb

@@ -200,13 +200,6 @@ def __vault_load_attributes!
         end
       end
 
-      # In ActiveRecord 4.2, virtual attributes are not excluded from joins aliases
-      if respond_to?(:persistable_attribute_names)
-        def self.column_names
-          super & persistable_attribute_names
-        end
-      end
-
       # Decrypt and load a single attribute from Vault.
       def __vault_load_attribute!(attribute, options)
         # If the user provided a value for the attribute, do not try to load it from Vault

lib/vault/rails.rb

@@ -11,6 +11,7 @@
 require_relative 'rails/serializers/integer_serializer'
 require_relative 'rails/serializers/float_serializer'
 require_relative 'rails/version'
+require_relative 'active_record/associations/join_dependency/join_part'
 
 module Vault
   module Rails

spec/dummy/app/models/person.rb

@@ -5,6 +5,10 @@ class Person < ActiveRecord::Base
 
   has_many :problems
 
+  before_validation :format_ssn, if: -> { ssn_changed? }
+
+  def format_ssn; end
+
   vault_attribute :county_plaintext, encrypted_column: :county_encrypted
   vault_attribute_proxy :county, :county_plaintext