summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-14 17:41:42 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-14 17:41:42 +0000
commit45f76c5d0cb6473faf7dca656b90e299799edf94 (patch)
treec3585ae047c1b46fc45a1011549daa546b5290e7 /lib/puppet/parser
parente32a1bd40e6d706b4e0c5316bf32aec52133f309 (diff)
downloadpuppet-45f76c5d0cb6473faf7dca656b90e299799edf94.tar.gz
puppet-45f76c5d0cb6473faf7dca656b90e299799edf94.tar.xz
puppet-45f76c5d0cb6473faf7dca656b90e299799edf94.zip
Significantly optimizing the database queries -- I am getting about 40% better times now. See http://www.madstop.com/optimizing_the_activerecord_integration.html.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2585 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser')
-rw-r--r--lib/puppet/parser/resource.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 4147d6327..25c9ab707 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -190,7 +190,7 @@ class Puppet::Parser::Resource
hash
end
- db_resource.ar_hash_merge(db_resource.get_params_hash(), updated_params,
+ db_resource.ar_hash_merge(db_resource.get_params_hash(db_resource.param_values), updated_params,
:create => Proc.new { |name, parameter|
parameter.to_rails(db_resource)
}, :delete => Proc.new { |values|