aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-04-29 22:18:08 -0500
committerYves Senn <yves.senn@gmail.com>2014-05-04 14:14:26 +0200
commit242bcac17b2b8397bd1ff77a2bddc37fc6628939 (patch)
tree2a0b37122cde4fbea13dc48899274fef1b1315bd /activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
parent51c0b8a2ce18a3ffd8fb5402c76f5837d0976bb2 (diff)
downloadrails-242bcac17b2b8397bd1ff77a2bddc37fc6628939.tar.gz
rails-242bcac17b2b8397bd1ff77a2bddc37fc6628939.tar.bz2
rails-242bcac17b2b8397bd1ff77a2bddc37fc6628939.zip
refactor, move `column_for` to `AbstractAdapter` for better reuse.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 2c6186774f..737f2daa63 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -495,11 +495,9 @@ module ActiveRecord
end
def rename_column(table_name, column_name, new_column_name) #:nodoc:
- unless columns(table_name).detect{|c| c.name == column_name.to_s }
- raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
- end
- alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
- rename_column_indexes(table_name, column_name, new_column_name)
+ column = column_for(table_name, column_name)
+ alter_table(table_name, rename: {column.name => new_column_name.to_s})
+ rename_column_indexes(table_name, column.name, new_column_name)
end
protected