Ticket #8088: fixtures_initialize_fix.diff

fixtures.rb

@@ -276 +276 @@
-
-  def initialize(connection, table_name, class_name, fixture_path, file_filter = DEFAULT_FILTER_RE)
-    @connection, @table_name, @fixture_path, @file_filter = connection, table_name, fixture_path, file_filter
- 
+
-                  (ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize)
+    if class_name.class == NilClass
+      begin
+        klass = eval("#{@class_name}")
+        @table_name = klass.table_name if klass.respond_to?(:table_name)
+        @connection = klass.connection if klass.respond_to?(:connection)
+      rescue
+        # swallow errors when @class_name is not really a class
+      end
+    else
+      @table_name = class_name.table_name if class_name.respond_to?(:table_name)
+      @connection = class_name.connection if class_name.respond_to?(:connection)
+    end
-    @table_name = ActiveRecord::Base.table_name_prefix + @table_name + ActiveRecord::Base.table_name_suffix
-    @table_name = class_name.table_name if class_name.respond_to?(:table_name)
-    @connection = class_name.connection if class_name.respond_to?(:connection)
-    read_fixture_files
-  end
-