aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-06 11:25:24 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-06 11:25:24 -0800
commitf3a3203b00438c7c2782ad6a914a73f96dec95f7 (patch)
treec45cea6e7e61739d60e0e8c49be33add6afb3686 /activerecord/lib
parentf0ad8532f3497110d590df42c573050944d41f92 (diff)
parentf2b048529bd8020505baf999fe23a365753a8280 (diff)
downloadrails-f3a3203b00438c7c2782ad6a914a73f96dec95f7.tar.gz
rails-f3a3203b00438c7c2782ad6a914a73f96dec95f7.tar.bz2
rails-f3a3203b00438c7c2782ad6a914a73f96dec95f7.zip
Merge pull request #5304 from kennyj/fix_connection_dependency
Revert table_name= needs connection now, so just stub table_name
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/model_schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 24896801d4..99847ac161 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -118,7 +118,7 @@ module ActiveRecord
if defined?(@table_name)
return if value == @table_name
- reset_column_information
+ reset_column_information if connected?
end
@table_name = value