aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/persistence.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-12-28 00:45:35 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-12-28 10:11:27 -0200
commit304d38c0536dc32a8a1595ba34370ebf69a0d50d (patch)
treed45a7b846e4fb22bb39f1d4fba6edd1c7ecb54cb /activerecord/lib/active_record/persistence.rb
parent897b56bb2f8c2a904f546db1a32bad074463ec9b (diff)
downloadrails-304d38c0536dc32a8a1595ba34370ebf69a0d50d.tar.gz
rails-304d38c0536dc32a8a1595ba34370ebf69a0d50d.tar.bz2
rails-304d38c0536dc32a8a1595ba34370ebf69a0d50d.zip
Allow primary_key to be an attribute when the model is a new record
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r--activerecord/lib/active_record/persistence.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 9ac8fcb176..1fc9472231 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -282,7 +282,7 @@ module ActiveRecord
# that instances loaded from the database would.
def attributes_from_column_definition
Hash[self.class.columns.map do |column|
- [column.name, column.default] unless column.name == self.class.primary_key
+ [column.name, column.default]
end]
end
end