diff options
Diffstat (limited to 'lib/puppet/rails/database')
4 files changed, 7 insertions, 21 deletions
diff --git a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb index 138f9f151..65432a6b7 100644 --- a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +++ b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb @@ -1,17 +1,13 @@ class AddCreatedAtToAllTables < ActiveRecord::Migration def self.up ActiveRecord::Base.connection.tables.each do |t| - unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at") - add_column t.to_s, :created_at, :datetime - end + add_column t.to_s, :created_at, :datetime unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at") end end def self.down ActiveRecord::Base.connection.tables.each do |t| - unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at") - remove_column t.to_s, :created_at - end + remove_column t.to_s, :created_at unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at") end end end diff --git a/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb b/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb index 050ca7f43..c1e60db14 100644 --- a/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +++ b/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb @@ -1,17 +1,13 @@ class RemoveDuplicatedIndexOnAllTables < ActiveRecord::Migration def self.up ActiveRecord::Base.connection.tables.each do |t| - if ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id") - remove_index t.to_s, :id - end + remove_index t.to_s, :id if ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id") end end def self.down ActiveRecord::Base.connection.tables.each do |t| - unless ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id") - add_index t.to_s, :id, :integer => true - end + add_index t.to_s, :id, :integer => true unless ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id") end end end diff --git a/lib/puppet/rails/database/003_add_environment_to_host.rb b/lib/puppet/rails/database/003_add_environment_to_host.rb index 4ab2fbc63..95f036d11 100644 --- a/lib/puppet/rails/database/003_add_environment_to_host.rb +++ b/lib/puppet/rails/database/003_add_environment_to_host.rb @@ -1,13 +1,9 @@ class AddEnvironmentToHost < ActiveRecord::Migration def self.up - unless ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment") - add_column :hosts, :environment, :string - end + add_column :hosts, :environment, :string unless ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment") end def self.down - if ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment") - remove_column :hosts, :environment - end + remove_column :hosts, :environment if ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment") end end diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb index a2477f2e6..8cb7350eb 100644 --- a/lib/puppet/rails/database/schema.rb +++ b/lib/puppet/rails/database/schema.rb @@ -52,9 +52,7 @@ class Puppet::Rails::Schema end # Oracle automatically creates a primary key index - if Puppet[:dbadapter] != "oracle_enhanced" - add_index :puppet_tags, :id, :integer => true - end + add_index :puppet_tags, :id, :integer => true if Puppet[:dbadapter] != "oracle_enhanced" create_table :hosts do |t| t.column :name, :string, :null => false |