11 files changed, 30 insertions, 49 deletions
diff --git a/lib/puppet/feature/rails.rb b/lib/puppet/feature/rails.rb
index 1775339a0..edfeccace 100644
--- a/lib/puppet/feature/rails.rb
+++ b/lib/puppet/feature/rails.rb
@@ -28,7 +28,7 @@ Puppet.features.add(:rails) do
     unless defined? ActiveRecord
         begin
             require 'rubygems'
-            require_gem 'rails'
+            gem 'rails'
         rescue LoadError
             # Nothing
         end
diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb
index 31d43bd18..d10bf5407 100644
--- a/lib/puppet/parser/resource.rb
+++ b/lib/puppet/parser/resource.rb
@@ -287,6 +287,8 @@ class Puppet::Parser::Resource
         obj.collection_merge(:param_names, @params) do |name, param|
             param.to_rails(obj)
         end
+        
+        obj.save
 
         return obj
     end
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 28f2b8584..a582dcef9 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -12,7 +12,7 @@ module Puppet::Rails
             :desc => "The database cache for client configurations.  Used for
                 querying within the language."
         },
-        :dbadapter => [ "sqlite3", "The type of database to use." ],
+        :dbadapter => [ "mysql", "The type of database to use." ],
         :dbmigrate => [ false, "Whether to automatically migrate the database." ],
         :dbname => [ "puppet", "The name of the database to use." ],
         :dbserver => [ "localhost", "The database server for Client caching. Only
diff --git a/lib/puppet/rails/external/tagging/acts_as_taggable.rb b/lib/puppet/rails/external/tagging/acts_as_taggable.rb
index 137a1c2a8..7fd7f6b12 100644
--- a/lib/puppet/rails/external/tagging/acts_as_taggable.rb
+++ b/lib/puppet/rails/external/tagging/acts_as_taggable.rb
@@ -14,7 +14,7 @@ module ActiveRecord
           
           class_inheritable_reader :acts_as_taggable_options
 
-          has_many :taggings, :as => :taggable, :dependent => true
+          has_many :taggings, :as => :taggable, :dependent => :destroy
           has_many :tags, :through => :taggings
 
           include ActiveRecord::Acts::Taggable::InstanceMethods
diff --git a/lib/puppet/rails/fact.rb b/lib/puppet/rails/fact.rb
new file mode 100644
index 000000000..ba8462c23
--- /dev/null
+++ b/lib/puppet/rails/fact.rb
@@ -0,0 +1,3 @@
+class Puppet::Rails::Fact < ActiveRecord::Base
+end
+
diff --git a/lib/puppet/rails/fact_name.rb b/lib/puppet/rails/fact_name.rb
deleted file mode 100644
index 47687589d..000000000
--- a/lib/puppet/rails/fact_name.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Puppet::Rails::FactName < ActiveRecord::Base
-    has_many :fact_values, :dependent => :destroy
-end
-
-# $Id$
diff --git a/lib/puppet/rails/fact_value.rb b/lib/puppet/rails/fact_value.rb
deleted file mode 100644
index f42362c97..000000000
--- a/lib/puppet/rails/fact_value.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Puppet::Rails::FactValue < ActiveRecord::Base
-    belongs_to :fact_name
-end
-
-# $Id$
diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb
index 3efdfa9df..900cda6cc 100644
--- a/lib/puppet/rails/host.rb
+++ b/lib/puppet/rails/host.rb
@@ -4,12 +4,11 @@ require 'puppet/util/rails/collection_merger'
 class Puppet::Rails::Host < ActiveRecord::Base
     include Puppet::Util::CollectionMerger
 
-    has_many :fact_values, :through => :fact_names 
-    has_many :fact_names, :dependent => :destroy
+    has_many :facts, :dependent => :destroy
     belongs_to :puppet_classes
     has_many :source_files
     has_many :resources,
-        :include => [ :param_names, :param_values ],
+        :include => [ :params ],
         :dependent => :destroy
 
     acts_as_taggable
@@ -63,23 +62,18 @@ class Puppet::Rails::Host < ActiveRecord::Base
 
     # Return the value of a fact.
     def fact(name)
-        if fv = self.fact_values.find(:first, :conditions => "fact_names.name = '#{name}'") 
-            return fv.value
+        if f = self.facts.find_by_name(name)
+            return f.value
         else
             return nil
         end
     end
 
     def setfacts(facts)
-        collection_merge(:fact_names, facts) do |name, value|
-            fn = fact_names.find_by_name(name) || fact_names.build(:name => name)
+        collection_merge(:facts, facts) do |name, value|
+            f = facts.find_by_name(name) || facts.build(:name => name)
             # We're only ever going to have one fact value, at this point.
-            unless fv = fn.fact_values.find_by_value(value)
-                fv = fn.fact_values.build(:value => value)
-            end
-            fn.fact_values = [fv]
-
-            fn
+            f
         end
     end
 
diff --git a/lib/puppet/rails/param_name.rb b/lib/puppet/rails/param.rb
index c90765ebb..2e98bd258 100644
--- a/lib/puppet/rails/param_name.rb
+++ b/lib/puppet/rails/param.rb
@@ -1,15 +1,14 @@
 require 'puppet/util/rails/collection_merger'
 
-class Puppet::Rails::ParamName < ActiveRecord::Base
+class Puppet::Rails::Param < ActiveRecord::Base
     include Puppet::Util::CollectionMerger
-    has_many :param_values, :dependent => :destroy
     belongs_to :resource
 
     def to_resourceparam(source)
         hash = {}
         hash[:name] = self.name.to_sym
         hash[:source] = source
-        hash[:value] = self.param_values.find(:all).collect { |v| v.value }
+        hash[:value] = self.param.value.find(:all).collect { |v| v.value }
         if hash[:value].length == 1
             hash[:value] = hash[:value].shift
         end
@@ -20,4 +19,3 @@ class Puppet::Rails::ParamName < ActiveRecord::Base
     end
 end
 
-# $Id$
diff --git a/lib/puppet/rails/param_value.rb b/lib/puppet/rails/param_value.rb
deleted file mode 100644
index d988559af..000000000
--- a/lib/puppet/rails/param_value.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Puppet::Rails::ParamValue < ActiveRecord::Base
-    belongs_to :param_name
-end
-
-# $Id$
diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb
index 6656c2450..b0bfc1ed6 100644
--- a/lib/puppet/rails/resource.rb
+++ b/lib/puppet/rails/resource.rb
@@ -1,17 +1,21 @@
 require 'puppet'
 require 'puppet/rails/external/tagging/init'
-require 'puppet/rails/param_name'
+require 'puppet/rails/param'
 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 :params, :dependent => :destroy
     belongs_to :source_file
     belongs_to :host
 
     acts_as_taggable
+
+    Puppet::Type.eachtype do |type|
+        klass = Class.new(Puppet::Rails::Resource)
+        Object.const_set("Puppet%s" % type.name.to_s.capitalize, klass)
+    end
     
     def tags=(tags)
         tags.each do |tag|   
@@ -28,20 +32,15 @@ class Puppet::Rails::Resource < ActiveRecord::Base
     end
 
     def parameter(param)
-        if pn = param_names.find_by_name(param)
-            if pv = pn.param_values.find(:first)
-                return pv.value
-            else
-                return nil
-            end
+        if p = params.find_by_name(param)
+            return p.value
         end
     end
 
     def parameters
         hash = {}
-        self.param_values.find(:all).each do |pvalue|
-            pname = pvalue.param_name.name
-            hash.store(pname, pvalue.value)
+        self.params.find(:all).each do |p|
+            hash.store(p.name, p.value)
         end
         return hash
     end
@@ -70,8 +69,8 @@ class Puppet::Rails::Resource < ActiveRecord::Base
         hash[:scope] = scope
         hash[:source] = scope.source
         obj = Puppet::Parser::Resource.new(hash)
-        self.param_names.each do |pname|
-            obj.set(pname.to_resourceparam(scope.source))
+        self.params.each do |p|
+            obj.set(p.to_resourceparam(scope.source))
         end
 
         # Store the ID, so we can check if we're re-collecting the same resource.