diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-27 05:03:39 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-28 20:11:04 +0300 |
commit | e96f2f248a63cc7115fb52a02b1743f15205e642 (patch) | |
tree | b42d9b1745cf917d6a9d815e02060fa2882d1076 /lib | |
parent | 790a51a42778b3aa3fb5c8c5afe687ef06dd4433 (diff) |
Mark cached value as persisted when is an instance of ActiveRecord::Base
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/json_cache.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/gitlab/json_cache.rb b/lib/gitlab/json_cache.rb index 1adf83739ad..24daad638f4 100644 --- a/lib/gitlab/json_cache.rb +++ b/lib/gitlab/json_cache.rb @@ -71,7 +71,21 @@ module Gitlab end def parse_entry(raw, klass) - klass.new(raw) if valid_entry?(raw, klass) + return unless valid_entry?(raw, klass) + return klass.new(raw) unless klass.ancestors.include?(ActiveRecord::Base) + + # When the cached value is a persisted instance of ActiveRecord::Base in + # some cases a relation can return an empty collection becauses scope.none! + # is being applied on ActiveRecord::Associations::CollectionAssociation#scope + # when the new_record? method incorrectly returns false. + # + # See https://gitlab.com/gitlab-org/gitlab-ee/issues/9903#note_145329964 + attributes = klass.attributes_builder.build_from_database(raw, {}) + klass.allocate.init_with("attributes" => attributes, "new_record" => new_record?(raw, klass)) + end + + def new_record?(raw, klass) + raw.fetch(klass.primary_key, nil).blank? end def valid_entry?(raw, klass) |