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

merge tweaks

Browse source
This commit is contained in:
Administrator 2026-05-31 18:43:27 -07:00
parent 7631cd8c6c
commit e4798df810
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/gxg/gxg_database_persistedhash.rb
View file

@ -973,11 +973,17 @@ module GxG
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
if result.keys.include?(import_key) if result.keys.include?(import_key)
result[(import_key)] = input_object[(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 end
else else
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
result[(import_key)] = input_object[(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 end
# #
@ -995,12 +1001,18 @@ module GxG
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
if result.keys.include?(import_key) if result.keys.include?(import_key)
result[(import_key)] = input_object[(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 end
result.format = @format result.format = @format
else else
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
result[(import_key)] = input_object[(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 end
# #
@ -2916,11 +2928,17 @@ module GxG
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
if result.keys.include?(import_key) if result.keys.include?(import_key)
result[(import_key)] = input_object[(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 end
else else
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
result[(import_key)] = input_object[(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 end
# #
@ -2941,12 +2959,18 @@ module GxG
self.keys.each do |import_key| self.keys.each do |import_key|
if input_object.keys.include?(import_key) if input_object.keys.include?(import_key)
result[(import_key)] = input_object[(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 end
result.format = @format result.format = @format
else else
input_object.keys.each do |import_key| input_object.keys.each do |import_key|
result[(import_key)] = input_object[(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 end
# #