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

Added merge to Hash/Detached/Persisted

Browse source
This commit is contained in:
Administrator 2026-03-29 08:16:47 -07:00
parent 1bd8e8fb41
commit 2a32efd9a7
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gxg-framework.gemspec
View file

@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'gxg-framework'
s.version = '0.0.68'
s.version = '0.0.69'
s.licenses = ['HIPPOCRATIC 2.1', 'https://firstdonoharm.dev/version/2/1/license.html']
s.summary = "GxG Framework"
s.description = "GxG Framework"

31
lib/gxg/gxg_database_persistedhash.rb
View file

@ -2914,26 +2914,29 @@ module GxG
result
end
#
def merge(input_object=nil, options={})
result = self
def merge(input_object=nil, options={:role => :data, :credential => ::GxG::DB[:administrator]})
result = nil
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 self.keys.include?(import_key)
database = ::GxG::DB[:roles][(options[:role] || :data)]
if database.is_a?(::GxG::Database::Database)
result = database.try_persist({}, (options[:credential] || ::GxG::DB[:administrator]))
#
if @format
# merge only keys common to both
self.keys.each do |import_key|
if input_object.keys.include?(import_key)
result[(import_key)] = input_object[(import_key)]
end
end
result.format = @format
else
input_object.keys.each do |import_key|
result[(import_key)] = input_object[(import_key)]
end
end
result.format = @format
else
input_object.keys.each do |import_key|
result[(import_key)] = input_object[(import_key)]
end
#
end
#
end
result
end