check BOTH primary key and id for now

Author: catmando

ruby/hyper-model/lib/active_record_base.rb

@@ -393,7 +393,7 @@ def __hyperstack_secure_attributes(acting_user)
         end
       end
 
-      scope __hyperstack_internal_where_scope,
+      scope :__hyperstack_internal_where_scope,
         ->(attrs) { where(attrs) }, # server side we just call where
         filter: ->(attrs) { !attrs.detect { |k, v| self[k] != v } } # client side optimization
 

ruby/hyper-model/lib/reactive_record/server_data_cache.rb

@@ -506,7 +506,7 @@ def self.load_from_json(tree, target = nil)
 
             target.send "#{method}=", value.first
           elsif value.is_a? Array
-            target.send("_hyperstack_internal_setter_#{method}", value.first) unless method == target.class.primary_key
+            target.send("_hyperstack_internal_setter_#{method}", value.first) unless [target.class.primary_key, :id].include? method
           elsif value.is_a?(Hash) && value[:id] && value[:id].first && (association = target.class.reflect_on_association(method))
             # not sure if its necessary to check the id above... is it possible to for the method to be an association but not have an id?
             klass = value[:model_name] ? Object.const_get(value[:model_name].first) : association.klass