diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-19 04:57:57 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-19 04:57:57 +0000 |
| commit | 9f4870637ce57d548d23c0b3330200014327c268 (patch) | |
| tree | b820cfb5a8150dc00d475ffe0cde6316ad210a91 /lib/puppet/rails/resource.rb | |
| parent | dc5f4dc0d01dc2ccb4679afbf3802a7ab0f3c126 (diff) | |
| download | puppet-9f4870637ce57d548d23c0b3330200014327c268.tar.gz puppet-9f4870637ce57d548d23c0b3330200014327c268.tar.xz puppet-9f4870637ce57d548d23c0b3330200014327c268.zip | |
All rails *and* language tests now pass, with the exception of a language/resource test that passes by itself but fails when run as part of the whole suite. Also, I added deletion where appropriate, so that unspecified resources, parameters, and facts are now deleted, as one would expect.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1951 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/rails/resource.rb')
| -rw-r--r-- | lib/puppet/rails/resource.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb index c0a7fbd8c..d78b02b88 100644 --- a/lib/puppet/rails/resource.rb +++ b/lib/puppet/rails/resource.rb @@ -1,8 +1,11 @@ require 'puppet' require 'puppet/rails/lib/init' require 'puppet/rails/param_name' +require 'puppet/util/rails/collection_merger' class Puppet::Rails::Resource < ActiveRecord::Base + include Puppet::Util::CollectionMerger + has_many :param_values, :through => :param_names has_many :param_names, :dependent => :destroy has_many :source_files |