aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-11-25 22:08:38 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-11-25 22:08:38 +0000
commitf4b5ca1ff0113e41c974b7cbda1f734f9c0526fe (patch)
treea4c8d309f2167c6874954201eb8f864ebdf535c6 /activerecord/lib
parentea713b6bb9680ef6226761dfc1501f261198723d (diff)
downloadrails-f4b5ca1ff0113e41c974b7cbda1f734f9c0526fe.tar.gz
rails-f4b5ca1ff0113e41c974b7cbda1f734f9c0526fe.tar.bz2
rails-f4b5ca1ff0113e41c974b7cbda1f734f9c0526fe.zip
Fixed that create table with :id => false and fixtures don't play nice together (closes #10154) [jbarnette]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8205 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/fixtures.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 97fca6026b..fbd614c969 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -574,8 +574,8 @@ class Fixtures < YAML::Omap
row[key] = label if value == "$LABEL"
end
- # generate a primary key
- row[primary_key_name] = Fixtures.identify(label)
+ # generate a primary key if necessary
+ row[primary_key_name] = Fixtures.identify(label) if has_primary_key?
model_class.reflect_on_all_associations.each do |association|
case association.macro
@@ -633,6 +633,10 @@ class Fixtures < YAML::Omap
@primary_key_name ||= model_class && model_class.primary_key
end
+ def has_primary_key?
+ model_class && model_class.columns.any? { |c| c.name == primary_key_name }
+ end
+
def timestamp_column_names
@timestamp_column_names ||= %w(created_at created_on updated_at updated_on).select do |name|
column_names.include?(name)