0
@@ -541,10 +541,11 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
0
     label.to_s.hash.abs
0
   end
0
 
0
-  attr_reader :table_name
0
+  attr_reader :table_name, :name
0
 
0
   def initialize(connection, table_name, class_name, fixture_path, file_filter = DEFAULT_FILTER_RE)
0
     @connection, @table_name, @fixture_path, @file_filter = connection, table_name, fixture_path, file_filter
0
+    @name = table_name # preserve fixture base name
0
     @class_name = class_name ||
0
                   (ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize)
0
     @table_name = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}"
0
@@ -963,9 +964,9 @@ module Test #:nodoc:
0
           fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
0
           unless fixtures.nil?
0
             if fixtures.instance_of?(Fixtures)
0
-              @loaded_fixtures[fixtures.table_name] = fixtures
0
+              @loaded_fixtures[fixtures.name] = fixtures
0
             else
0
-              fixtures.each { |f| @loaded_fixtures[f.table_name] = f }
0
+              fixtures.each { |f| @loaded_fixtures[f.name] = f }
0
             end
0
           end
0
         end

0
@@ -15,6 +15,7 @@ require 'models/pirate'
0
 require 'models/treasure'
0
 require 'models/matey'
0
 require 'models/ship'
0
+require 'models/book'
0
 
0
 class FixturesTest < ActiveRecord::TestCase
0
   self.use_instantiated_fixtures = true
0
@@ -373,6 +374,34 @@ class CheckSetTableNameFixturesTest < ActiveRecord::TestCase
0
   end
0
 end
0
 
0
+class FixtureNameIsNotTableNameFixturesTest < ActiveRecord::TestCase
0
+  set_fixture_class :items => Book
0
+  fixtures :items
0
+  # Set to false to blow away fixtures cache and ensure our fixtures are loaded 
0
+  # and thus takes into account our set_fixture_class
0
+  self.use_transactional_fixtures = false
0
+
0
+  def test_named_accessor
0
+    assert_kind_of Book, items(:dvd)
0
+  end
0
+end
0
+
0
+class FixtureNameIsNotTableNameMultipleFixturesTest < ActiveRecord::TestCase
0
+  set_fixture_class :items => Book, :funny_jokes => Joke
0
+  fixtures :items, :funny_jokes
0
+  # Set to false to blow away fixtures cache and ensure our fixtures are loaded 
0
+  # and thus takes into account our set_fixture_class
0
+  self.use_transactional_fixtures = false
0
+
0
+  def test_named_accessor_of_differently_named_fixture
0
+    assert_kind_of Book, items(:dvd)
0
+  end
0
+
0
+  def test_named_accessor_of_same_named_fixture
0
+    assert_kind_of Joke, funny_jokes(:a_joke)
0
+  end
0
+end
0
+
0
 class CustomConnectionFixturesTest < ActiveRecord::TestCase
0
   set_fixture_class :courses => Course
0
   fixtures :courses