aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-04-13 08:54:14 -0700
committerJon Leighton <j@jonathanleighton.com>2012-04-13 08:54:14 -0700
commit012bab8c9f0e9a9208e32ef57c8dd5c7e1c2f115 (patch)
treef1299acedd68105c26db6a6ea06926e07aa6a76f /activerecord/lib/active_record
parent1391d74e41b786d2f1a3a4ecf7fad1eda7e49622 (diff)
parentf49d76662ed130ca41806bb3d91666423a411074 (diff)
downloadrails-012bab8c9f0e9a9208e32ef57c8dd5c7e1c2f115.tar.gz
rails-012bab8c9f0e9a9208e32ef57c8dd5c7e1c2f115.tar.bz2
rails-012bab8c9f0e9a9208e32ef57c8dd5c7e1c2f115.zip
Merge pull request #5832 from kennyj/fix_5267
Fix a wrong return value from reset_sequence_name method.
Diffstat (limited to 'activerecord/lib/active_record')
-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 c85d590ce1..7f38dda11e 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -172,8 +172,8 @@ module ActiveRecord
end
def reset_sequence_name #:nodoc:
- @sequence_name = connection.default_sequence_name(table_name, primary_key)
@explicit_sequence_name = false
+ @sequence_name = connection.default_sequence_name(table_name, primary_key)
end
# Sets the name of the sequence to use when generating ids to the given