Tweak fixtures so they don't try to use a non-ActiveRecord class. [Kevin Clark]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4752 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activerecord/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Tweak fixtures so they don't try to use a non-ActiveRecord class.  [Kevin Clark]
+
 * Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore.  [Rick Olson]
 
 * Document find's :from option. Closes #5762. [andrew@redlinesoftware.com]

activerecord/lib/active_record/fixtures.rb

@@ -395,7 +395,7 @@ class Fixture #:nodoc:
     klass = @class_name.constantize rescue nil
 
     list = @fixture.inject([]) do |fixtures, (key, value)|
-      col = klass.columns_hash[key] unless klass.nil?
+      col = klass.columns_hash[key] if klass.kind_of?(ActiveRecord::Base)
       fixtures << ActiveRecord::Base.connection.quote(value, col).gsub('\\n', "\n").gsub('\\r', "\r")
     end
     list * ', '

activerecord/test/fixtures_test.rb

@@ -343,3 +343,13 @@ class InvalidTableNameFixturesTest < Test::Unit::TestCase
     end
   end
 end
+
+class DevelopersProject; end;
+
+class ManyToManyFixturesWithClassDefined < Test::Unit::TestCase
+  fixtures :developers_projects
+  
+  def test_this_should_run_cleanly
+    assert true
+  end
+end