diff options
| author | Luke Kanies <luke@madstop.com> | 2008-04-21 23:45:53 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-21 23:45:53 -0500 |
| commit | 0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1 (patch) | |
| tree | 0bcf46830c65667ebf85e44f8699243f8da5a5f3 /lib/puppet/rails | |
| parent | 58fb416e9f52a9dc834b735ffa7e5c425495c982 (diff) | |
| parent | 62ca72608c8fcded624c46c6951b9381a7284a80 (diff) | |
| download | puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.tar.gz puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.tar.xz puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.zip | |
Merge branch '0.24.x'
Conflicts:
bin/puppetca
Diffstat (limited to 'lib/puppet/rails')
| -rw-r--r-- | lib/puppet/rails/database/schema.rb | 9 | ||||
| -rw-r--r-- | lib/puppet/rails/resource.rb | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb index 5365ce2a4..d11d91aa5 100644 --- a/lib/puppet/rails/database/schema.rb +++ b/lib/puppet/rails/database/schema.rb @@ -14,6 +14,7 @@ class Puppet::Rails::Schema t.column :exported, :boolean t.column :line, :integer t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :resources, :id, :integer => true add_index :resources, :host_id, :integer => true @@ -31,6 +32,7 @@ class Puppet::Rails::Schema t.column :filename, :string t.column :path, :string t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :source_files, :id, :integer => true add_index :source_files, :filename @@ -39,6 +41,7 @@ class Puppet::Rails::Schema t.column :resource_id, :integer t.column :puppet_tag_id, :integer t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :resource_tags, :id, :integer => true add_index :resource_tags, :resource_id, :integer => true @@ -47,6 +50,7 @@ class Puppet::Rails::Schema create_table :puppet_tags do |t| t.column :name, :string t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :puppet_tags, :id, :integer => true @@ -59,6 +63,7 @@ class Puppet::Rails::Schema #Use updated_at to automatically add timestamp on save. t.column :updated_at, :datetime t.column :source_file_id, :integer + t.column :created_at, :datetime end add_index :hosts, :id, :integer => true add_index :hosts, :source_file_id, :integer => true @@ -67,6 +72,7 @@ class Puppet::Rails::Schema create_table :fact_names do |t| t.column :name, :string, :null => false t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :fact_names, :id, :integer => true add_index :fact_names, :name @@ -76,6 +82,7 @@ class Puppet::Rails::Schema t.column :fact_name_id, :integer, :null => false t.column :host_id, :integer, :null => false t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :fact_values, :id, :integer => true add_index :fact_values, :fact_name_id, :integer => true @@ -87,6 +94,7 @@ class Puppet::Rails::Schema t.column :line, :integer t.column :resource_id, :integer t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :param_values, :id, :integer => true add_index :param_values, :param_name_id, :integer => true @@ -95,6 +103,7 @@ class Puppet::Rails::Schema create_table :param_names do |t| t.column :name, :string, :null => false t.column :updated_at, :datetime + t.column :created_at, :datetime end add_index :param_names, :id, :integer => true add_index :param_names, :name diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb index 785c63419..0053dc28d 100644 --- a/lib/puppet/rails/resource.rb +++ b/lib/puppet/rails/resource.rb @@ -98,6 +98,7 @@ class Puppet::Rails::Resource < ActiveRecord::Base hash.delete("host_id") hash.delete("updated_at") hash.delete("source_file_id") + hash.delete("created_at") hash.delete("id") hash.each do |p, v| hash.delete(p) if v.nil? |