diff options
author | kennyj <kennyj@gmail.com> | 2012-07-10 01:54:22 +0900 |
---|---|---|
committer | kennyj <kennyj@gmail.com> | 2012-07-14 03:48:11 +0900 |
commit | 87a86449e743ee61ccb61d405e4ac2290d916c3b (patch) | |
tree | ca0a8e1ca989e5018eb07b75e0e3d09b75ec6b5a /activerecord/lib/active_record | |
parent | 539b69e05deaa6792e91f4f9dca6a2735f290a8f (diff) | |
download | rails-87a86449e743ee61ccb61d405e4ac2290d916c3b.tar.gz rails-87a86449e743ee61ccb61d405e4ac2290d916c3b.tar.bz2 rails-87a86449e743ee61ccb61d405e4ac2290d916c3b.zip |
Remove duplicated unique index name.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/schema_migration.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/schema_migration.rb b/activerecord/lib/active_record/schema_migration.rb index 236ec563d2..ca22154c84 100644 --- a/activerecord/lib/active_record/schema_migration.rb +++ b/activerecord/lib/active_record/schema_migration.rb @@ -7,7 +7,11 @@ module ActiveRecord attr_accessible :version def self.table_name - Base.table_name_prefix + 'schema_migrations' + Base.table_name_suffix + "#{Base.table_name_prefix}schema_migrations#{Base.table_name_suffix}" + end + + def self.index_name + "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}" end def self.create_table @@ -15,14 +19,13 @@ module ActiveRecord connection.create_table(table_name, :id => false) do |t| t.column :version, :string, :null => false end - connection.add_index table_name, :version, :unique => true, - :name => "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}" + connection.add_index table_name, :version, :unique => true, :name => index_name end end def self.drop_table if connection.table_exists?(table_name) - connection.remove_index table_name, :name => "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}" + connection.remove_index table_name, :name => index_name connection.drop_table(table_name) end end |