activerecord_sqlserver_crm 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c8162bb4c63c744295b08a767f3dd347967557
-  data.tar.gz: b0151c208209aad112ee07e250bbb63cf53c9339
+  metadata.gz: 883aa94a5b12bdc0d1af9c60f1a7c2a804556717
+  data.tar.gz: e86ab147af32ee872c652d59011eff0319911fe8
 SHA512:
-  metadata.gz: 8778543933b59bc25e589cb93e12f85b64ba5ab93a3e2e7c715d209bbda04cf86835af423cd47746de8a9f5216bfae8cf5deba0367223f928638c30a28048d96
-  data.tar.gz: 9032fb1c27e6ef1ddf1a400fe7cc3ea3ff448a6cb016202486d8ff72b4fb414ea4692ef716ccaf1cb82b5ecb98a4d179bdd4ffeeac7e5b8ec589ef730c4ab92f
+  metadata.gz: be3991ffe7c87808a3640011f81148ae63c74a7bb2d4513587f965421a4b20d5b89a4ad3aefb2b5da5f04c88c9306ef560a312a4562bac7169b89111da703580
+  data.tar.gz: 9824c7db65af61edd8fc6bf2198f189e135988b4141fc8b9ad59c5f20c8b2952a916d88921afc7dd63665697d16761ebf5d1870645bc19931913b8fe012ec1bf

data/lib/active_record_extension.rb

@@ -41,7 +41,7 @@ module ActiveRecordExtension
     if has_errors
       raise_validation_error
     else
-      reload unless id.nil?
+      reload_after_odata unless id.nil?
     end
     !has_errors
   end
@@ -53,11 +53,67 @@ module ActiveRecordExtension
     save
   end
 
+  # Created a method here because could not override ActiveRecord Persistance module because 3
+  # other modules override the reload method.
+  # I'm not really that thrilled with what I did here with this method for reload.
+  # Basically got parts from various ActiveRecord modules and combined them in here. I followed
+  # the reload through byebug to see how "reload" was being called
+  def reload_after_odata(options = nil)
+    # aggregations.rb
+    clear_aggregation_cache
+
+    # autosave_association.rb
+    @marked_for_destruction = false
+    @destroyed_by_association = nil
+
+    # associations.rb
+    clear_association_cache
+
+    # persistence.rb (only 1 line of code chaned in here)
+    self.class.connection.clear_query_cache
+
+    fresh_object =
+        if options && options[:lock]
+          self.class.unscoped { self.class.lock(options[:lock]).find(id) }
+        else
+          # Remove unscope here
+          self.class.find(id)
+        end
+
+    @attributes = fresh_object.instance_variable_get("@attributes")
+    @new_record = false
+
+    # attribute_methods/dirty.rb
+    @previous_mutation_tracker = nil
+    clear_mutation_trackers
+    @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
+
+    self
+  end
+
+
   def update_attribute(name, value)
     write_attribute(name,value)
     save
   end
 
+  # If using default_scope to restrict fields returned (with select)
+  # Change reload so it still uses the default scope rather than unscoped
+  def reload(options = nil)
+    self.class.connection.clear_query_cache
+
+    fresh_object =
+        if options && options[:lock]
+          self.class.unscoped { self.class.lock(options[:lock]).find(id) }
+        else
+          self.class.find(id)
+        end
+
+    @attributes = fresh_object.instance_variable_get("@attributes")
+    @new_record = false
+    self
+  end
+
   # add your static(class) methods here
   module ClassMethods
     def belongs_to_field?(field)

data/lib/activerecord_sqlserver_crm/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordSqlserverCrm
-  VERSION = "5.1.2"
+  VERSION = "5.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sqlserver_crm
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Rolf Lawrenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails