diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-03-09 13:43:57 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-03-09 13:43:57 -0800 |
| commit | 40e8b48eb19973ec413518be656249e134344ee0 (patch) | |
| tree | 8f6a10924b74ff2b52efe992feb4be420b7ae2f7 /lib/puppet/rails/database/schema.rb | |
| parent | eae17c3cba159d895e5ec2e87e4abe8c125a9562 (diff) | |
| parent | 531e25836e1313cd508ab8394e16cf438a62ac7b (diff) | |
| download | puppet-40e8b48eb19973ec413518be656249e134344ee0.tar.gz puppet-40e8b48eb19973ec413518be656249e134344ee0.tar.xz puppet-40e8b48eb19973ec413518be656249e134344ee0.zip | |
Merge branch 'maint/2.6.next/6338' into 2.6.next
Diffstat (limited to 'lib/puppet/rails/database/schema.rb')
| -rw-r--r-- | lib/puppet/rails/database/schema.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb index 5e455d6c0..9fd640fe4 100644 --- a/lib/puppet/rails/database/schema.rb +++ b/lib/puppet/rails/database/schema.rb @@ -104,22 +104,22 @@ class Puppet::Rails::Schema end add_index :param_names, :name - create_table :inventory_hosts do |t| + create_table :inventory_nodes do |t| t.column :name, :string, :null => false t.column :timestamp, :datetime, :null => false t.column :updated_at, :datetime t.column :created_at, :datetime end - add_index :inventory_hosts, :name, :unique => true + add_index :inventory_nodes, :name, :unique => true create_table :inventory_facts, :id => false do |t| - t.column :inventory_host_id, :integer, :null => false + t.column :inventory_node_id, :integer, :null => false t.column :name, :string, :null => false t.column :value, :text, :null => false end - add_index :inventory_facts, [:inventory_host_id, :name], :unique => true + add_index :inventory_facts, [:inventory_node_id, :name], :unique => true end end ensure |