Persist default values of aliased attributes

1f150f6 made it so that default values
are always persisted.  This commit adds support for aliased attributes
to that change.

Author: jonathanhefner

lib/active_record/typed_store/behavior.rb

@@ -5,6 +5,13 @@ module Behavior
     extend ActiveSupport::Concern
 
     module ClassMethods
+      def typed_store_attribute_names
+        typed_stores.keys.map do |name|
+          name = name.to_s
+          attribute_aliases[name] || name
+        end
+      end
+
       def define_attribute_methods
         super
         define_typed_store_attribute_methods
@@ -78,16 +85,16 @@ def attribute_names_for_partial_inserts
       # Contrary to all vanilla Rails types, typedstore attribute have an inherent default
       # value that doesn't match the database column default.
       # As such we need to insert them on partial inserts even if they weren't changed.
-      super | self.class.typed_stores.keys.map(&:to_s)
+      super | self.class.typed_store_attribute_names
     end
 
     def attribute_names_for_partial_updates
       # On partial updates we shouldn't need to force stores to be persisted. However since
       # we weren't persisting them for a while on insertion, we now need to gracefully deal
       # with existing records that may have been persisted with a `NULL` store
       # We use `blank?` as an heuristic to detect these.
-      super | self.class.typed_stores.keys.map(&:to_s).select do |store|
-        @attributes.key?(store) && @attributes[store].value_before_type_cast.blank?
+      super | self.class.typed_store_attribute_names.select do |store|
+        read_attribute_before_type_cast(store).blank?
       end
     end
   end

spec/active_record/typed_store_spec.rb

@@ -958,19 +958,26 @@
 describe DirtyTrackingModel do
   it 'stores the default on creation' do
     model = DirtyTrackingModel.create!
+    model = DirtyTrackingModel.find(model.id)
+
     expect(model.settings_before_type_cast).to_not be_blank
+    expect(model.legacy_settings_before_type_cast).to_not be_blank
   end
 
   it 'handles loaded records having uninitialized defaults' do
     model = DirtyTrackingModel.create!
-    DirtyTrackingModel.update_all("settings = NULL") # bypass validation
+    DirtyTrackingModel.update_all("settings = NULL, sttgs = NULL") # bypass validation
+
     model = DirtyTrackingModel.find(model.id)
     expect(model.settings_changed?).to be false
     expect(model.changes).to be_empty
 
     model.update!(title: "Hello")
-
     expect(model.settings_changed?).to be false
     expect(model.changes).to be_empty
+
+    model = DirtyTrackingModel.find(model.id)
+    expect(model.settings_before_type_cast).to_not be_blank
+    expect(model.legacy_settings_before_type_cast).to_not be_blank
   end
 end

spec/support/models.rb

@@ -93,6 +93,7 @@ def self.up
     create_table(:dirty_tracking_models, force: true) do |t|
       t.string :title
       t.text :settings
+      t.text :sttgs
 
       t.timestamps
     end
@@ -190,13 +191,20 @@ class MarshalTypedStoreModel < ActiveRecord::Base
 ]
 
 class DirtyTrackingModel < ActiveRecord::Base
-  after_update :read_active
+  after_update :read_stores
 
   typed_store(:settings) do |f|
     f.boolean :active, default: false, null: false
   end
 
-  def read_active
+  alias_attribute :legacy_settings, :sttgs
+
+  typed_store(:legacy_settings) do |f|
+    f.boolean :migrated, default: false, null: false
+  end
+
+  def read_stores
     active
+    migrated
   end
 end