CascadiaDigitalCollective/gxg-web-client
CascadiaDigitalCollective/gxg-web-client
2
0
Fork 0
mirror of https://github.com/mistergibson/gxg-web-client.git synced 2026-08-15 03:26:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated merge

Browse source
This commit is contained in:
Administrator 2026-05-31 22:34:00 -07:00
parent 26827a4b36
commit be8190b467
1 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
gxg/web/gxg_database.rb
View file

@ -1168,6 +1168,62 @@ module GxG
result
end
#
def merge!(input_object=nil, options={})
result = self
if input_object.is_any?(::Hash, ::GxG::Database::DetachedHash, ::GxG::Database::PersistedHash)
#
if @format
# merge only keys common to both
input_object.keys.each do |import_key|
if result.keys.include?(import_key)
result[(import_key)] = input_object[(import_key)]
if input_object.is_any?(::GxG::Database::DetachedHash, ::GxG::Database::PersistedHash)
result.set_property_version(import_key, input_object.property_version(import_key))
end
end
end
else
input_object.keys.each do |import_key|
result[(import_key)] = input_object[(import_key)]
if input_object.is_any?(::GxG::Database::DetachedHash, ::GxG::Database::PersistedHash)
result.set_property_version(import_key, input_object.property_version(import_key))
end
end
end
#
end
result
end
#
def merge(input_object=nil, options={})
result = self
if input_object.is_any?(::Hash, ::GxG::Database::DetachedHash, ::GxG::Database::PersistedHash)
result = ::GxG::Database::DetachedHash::iterative_detached_persist(self.unpersist)
#
if @format
# merge only keys common to both
input_object.keys.each do |import_key|
if result.keys.include?(import_key)
result[(import_key)] = input_object[(import_key)]
if input_object.is_any?(::GxG::Database::DetachedHash, ::GxG::Database::PersistedHash)
result.set_property_version(import_key, input_object.property_version(import_key))
end
end
end
result.format = @format
else
input_object.keys.each do |import_key|
result[(import_key)] = input_object[(import_key)]
if input_object.is_any?(::GxG::Database::DetachedHash, ::GxG::Database::PersistedHash)
result.set_property_version(import_key, input_object.property_version(import_key))
end
end
end
#
end
result
end
#
end
#
class DetachedArray