activerecord 3.1.0.beta1 → 3.1.0.rc1

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -39,6 +39,16 @@ module ActiveRecord
       # :stopdoc:
       class << self
         attr_accessor :money_precision
+        def string_to_time(string)
+          return string unless String === string
+
+          case string
+          when 'infinity'  then 1.0 / 0.0
+          when '-infinity' then -1.0 / 0.0
+          else
+            super
+          end
+        end
       end
       # :startdoc:
 
@@ -349,6 +359,9 @@ module ActiveRecord
         return super unless column
 
         case value
+        when Float
+          return super unless value.infinite? && column.type == :datetime
+          "'#{value.to_s.downcase}'"
         when Numeric
           return super unless column.sql_type == 'money'
           # Not truly string input, so doesn't require (or allow) escape string syntax.
@@ -688,11 +701,11 @@ module ActiveRecord
          schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
          result = query(<<-SQL, name)
            SELECT distinct i.relname, d.indisunique, d.indkey, t.oid
-             FROM pg_class t, pg_class i, pg_index d
+           FROM pg_class t
+           INNER JOIN pg_index d ON t.oid = d.indrelid
+           INNER JOIN pg_class i ON d.indexrelid = i.oid
            WHERE i.relkind = 'i'
-             AND d.indexrelid = i.oid
              AND d.indisprimary = 'f'
-             AND t.oid = d.indrelid
              AND t.relname = '#{table_name}'
              AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
           ORDER BY i.relname
@@ -807,19 +820,13 @@ module ActiveRecord
         # given table's primary key.
         result = exec_query(<<-end_sql, 'SCHEMA').rows.first
           SELECT attr.attname, seq.relname
-          FROM pg_class      seq,
-               pg_attribute  attr,
-               pg_depend     dep,
-               pg_namespace  name,
-               pg_constraint cons
-          WHERE seq.oid           = dep.objid
-            AND seq.relkind       = 'S'
-            AND attr.attrelid     = dep.refobjid
-            AND attr.attnum       = dep.refobjsubid
-            AND attr.attrelid     = cons.conrelid
-            AND attr.attnum       = cons.conkey[1]
-            AND cons.contype      = 'p'
-            AND dep.refobjid      = '#{quote_table_name(table)}'::regclass
+          FROM pg_class seq
+          INNER JOIN pg_depend dep ON seq.oid = dep.objid
+          INNER JOIN pg_attribute attr ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
+          INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
+          WHERE seq.relkind  = 'S'
+            AND cons.contype = 'p'
+            AND dep.refobjid = '#{quote_table_name(table)}'::regclass
         end_sql
 
         # [primary_key, sequence]
@@ -832,16 +839,11 @@ module ActiveRecord
       def primary_key(table)
         row = exec_query(<<-end_sql, 'SCHEMA', [[nil, table]]).rows.first
           SELECT DISTINCT(attr.attname)
-          FROM pg_attribute  attr,
-               pg_depend     dep,
-               pg_namespace  name,
-               pg_constraint cons
-          WHERE attr.attrelid     = dep.refobjid
-            AND attr.attnum       = dep.refobjsubid
-            AND attr.attrelid     = cons.conrelid
-            AND attr.attnum       = cons.conkey[1]
-            AND cons.contype      = 'p'
-            AND dep.refobjid      = $1::regclass
+          FROM pg_attribute attr
+          INNER JOIN pg_depend dep ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
+          INNER JOIN pg_constraint cons ON attr.attrelid = cons.conrelid AND attr.attnum = cons.conkey[1]
+          WHERE cons.contype = 'p'
+            AND dep.refobjid = $1::regclass
         end_sql
 
         row && row.first

data/lib/active_record/fixtures.rb

@@ -13,6 +13,7 @@ require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/logger'
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/module/deprecation'
 
 if defined? ActiveRecord
   class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
@@ -28,11 +29,9 @@ class FixturesFileNotFound < StandardError; end
 #
 # = Fixture formats
 #
-# Fixtures come in 3 flavors:
+# Fixtures come in 1 flavor:
 #
 #   1.  YAML fixtures
-#   2.  CSV fixtures
-#   3.  Single-file fixtures
 #
 # == YAML fixtures
 #
@@ -74,56 +73,6 @@ class FixturesFileNotFound < StandardError; end
 #        parent_id:  1
 #        title:      Child
 #
-# == CSV fixtures
-#
-# Fixtures can also be kept in the Comma Separated Value (CSV) format. Akin to YAML fixtures, CSV fixtures are stored
-# in a single file, but instead end with the <tt>.csv</tt> file extension
-# (Rails example: <tt><your-rails-app>/test/fixtures/web_sites.csv</tt>).
-#
-# The format of this type of fixture file is much more compact than the others, but also a little harder to read by us
-# humans.  The first line of the CSV file is a comma-separated list of field names.  The rest of the
-# file is then comprised
-# of the actual data (1 per line).  Here's an example:
-#
-#   id, name, url
-#   1, Ruby On Rails, http://www.rubyonrails.org
-#   2, Google, http://www.google.com
-#
-# Should you have a piece of data with a comma character in it, you can place double quotes around that value.  If you
-# need to use a double quote character, you must escape it with another double quote.
-#
-# Another unique attribute of the CSV fixture is that it has *no* fixture name like the other two formats.  Instead, the
-# fixture names are automatically generated by deriving the class name of the fixture file and adding an incrementing
-# number to the end.  In our example, the 1st fixture would be called "web_site_1" and the 2nd one would be called
-# "web_site_2".
-#
-# Most databases and spreadsheets support exporting to CSV format, so this is a great format for you to choose if you
-# have existing data somewhere already.
-#
-# == Single-file fixtures
-#
-# This type of fixture was the original format for Active Record that has since been deprecated in
-# favor of the YAML and CSV formats.
-# Fixtures for this format are created by placing text files in a sub-directory (with the name of the model)
-# to the directory appointed by <tt>ActiveSupport::TestCase.fixture_path=(path)</tt> (this is automatically
-# configured for Rails, so you can just put your files in <tt><your-rails-app>/test/fixtures/<your-model-name>/</tt> --
-# like <tt><your-rails-app>/test/fixtures/web_sites/</tt> for the WebSite model).
-#
-# Each text file placed in this directory represents a "record".  Usually these types of fixtures are named without
-# extensions, but if you are on a Windows machine, you might consider adding <tt>.txt</tt> as the extension.
-# Here's what the above example might look like:
-#
-#   web_sites/google
-#   web_sites/yahoo.txt
-#   web_sites/ruby-on-rails
-#
-# The file format of a standard fixture is simple.  Each line is a property (or column in db speak) and has the syntax
-# of "name => value".  Here's an example of the ruby-on-rails fixture above:
-#
-#   id => 1
-#   name => Ruby on Rails
-#   url => http://www.rubyonrails.org
-#
 # = Using fixtures in testcases
 #
 # Since fixtures are a testing construct, we use them in our unit and functional tests.  There are two ways to use the
@@ -176,7 +125,7 @@ class FixturesFileNotFound < StandardError; end
 # = Dynamic fixtures with ERB
 #
 # Some times you don't care about the content of the fixtures as much as you care about the volume. In these cases, you can
-# mix ERB in with your YAML or CSV fixtures to create a bunch of fixtures for load testing, like:
+# mix ERB in with your YAML fixtures to create a bunch of fixtures for load testing, like:
 #
 #   <% for i in 1..1000 %>
 #   fix_<%= i %>:
@@ -423,8 +372,8 @@ class FixturesFileNotFound < StandardError; end
 # to the rescue:
 #
 #   george_reginald:
-#     monkey_id: <%= Fixtures.identify(:reginald) %>
-#     pirate_id: <%= Fixtures.identify(:george) %>
+#     monkey_id: <%= ActiveRecord::Fixtures.identify(:reginald) %>
+#     pirate_id: <%= ActiveRecord::Fixtures.identify(:george) %>
 #
 # == Support for YAML defaults
 #
@@ -444,369 +393,375 @@ class FixturesFileNotFound < StandardError; end
 #
 # Any fixture labeled "DEFAULTS" is safely ignored.
 
-class Fixtures
-  MAX_ID = 2 ** 30 - 1
+Fixture = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Fixture', 'ActiveRecord::Fixture')
+Fixtures = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Fixtures', 'ActiveRecord::Fixtures')
 
-  @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} }
+module ActiveRecord
+  class Fixtures
+    MAX_ID = 2 ** 30 - 1
 
-  def self.find_table_name(table_name) # :nodoc:
-    ActiveRecord::Base.pluralize_table_names ?
-      table_name.to_s.singularize.camelize :
-      table_name.to_s.camelize
-  end
+    @@all_cached_fixtures = Hash.new { |h,k| h[k] = {} }
 
-  def self.reset_cache
-    @@all_cached_fixtures.clear
-  end
+    def self.find_table_name(table_name) # :nodoc:
+      ActiveRecord::Base.pluralize_table_names ?
+        table_name.to_s.singularize.camelize :
+        table_name.to_s.camelize
+    end
 
-  def self.cache_for_connection(connection)
-    @@all_cached_fixtures[connection]
-  end
+    def self.reset_cache
+      @@all_cached_fixtures.clear
+    end
 
-  def self.fixture_is_cached?(connection, table_name)
-    cache_for_connection(connection)[table_name]
-  end
+    def self.cache_for_connection(connection)
+      @@all_cached_fixtures[connection]
+    end
 
-  def self.cached_fixtures(connection, keys_to_fetch = nil)
-    if keys_to_fetch
-      cache_for_connection(connection).values_at(*keys_to_fetch)
-    else
-      cache_for_connection(connection).values
+    def self.fixture_is_cached?(connection, table_name)
+      cache_for_connection(connection)[table_name]
     end
-  end
 
-  def self.cache_fixtures(connection, fixtures_map)
-    cache_for_connection(connection).update(fixtures_map)
-  end
+    def self.cached_fixtures(connection, keys_to_fetch = nil)
+      if keys_to_fetch
+        cache_for_connection(connection).values_at(*keys_to_fetch)
+      else
+        cache_for_connection(connection).values
+      end
+    end
+
+    def self.cache_fixtures(connection, fixtures_map)
+      cache_for_connection(connection).update(fixtures_map)
+    end
 
-  def self.instantiate_fixtures(object, fixture_name, fixtures, load_instances = true)
-    if load_instances
-      fixtures.each do |name, fixture|
-        begin
-          object.instance_variable_set "@#{name}", fixture.find
-        rescue FixtureClassNotFound
-          nil
+    def self.instantiate_fixtures(object, fixture_name, fixtures, load_instances = true)
+      if load_instances
+        fixtures.each do |name, fixture|
+          begin
+            object.instance_variable_set "@#{name}", fixture.find
+          rescue FixtureClassNotFound
+            nil
+          end
         end
       end
     end
-  end
 
-  def self.instantiate_all_loaded_fixtures(object, load_instances = true)
-    all_loaded_fixtures.each do |table_name, fixtures|
-      Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+    def self.instantiate_all_loaded_fixtures(object, load_instances = true)
+      all_loaded_fixtures.each do |table_name, fixtures|
+        ActiveRecord::Fixtures.instantiate_fixtures(object, table_name, fixtures, load_instances)
+      end
     end
-  end
 
-  cattr_accessor :all_loaded_fixtures
-  self.all_loaded_fixtures = {}
+    cattr_accessor :all_loaded_fixtures
+    self.all_loaded_fixtures = {}
 
-  def self.create_fixtures(fixtures_directory, table_names, class_names = {})
-    table_names = [table_names].flatten.map { |n| n.to_s }
-    table_names.each { |n|
-      class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
-    }
+    def self.create_fixtures(fixtures_directory, table_names, class_names = {})
+      table_names = [table_names].flatten.map { |n| n.to_s }
+      table_names.each { |n|
+        class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/')
+      }
 
-    # FIXME: Apparently JK uses this.
-    connection = block_given? ? yield : ActiveRecord::Base.connection
+      # FIXME: Apparently JK uses this.
+      connection = block_given? ? yield : ActiveRecord::Base.connection
 
-    files_to_read = table_names.reject { |table_name|
-      fixture_is_cached?(connection, table_name)
-    }
+      files_to_read = table_names.reject { |table_name|
+        fixture_is_cached?(connection, table_name)
+      }
 
-    unless files_to_read.empty?
-      connection.disable_referential_integrity do
-        fixtures_map = {}
+      unless files_to_read.empty?
+        connection.disable_referential_integrity do
+          fixtures_map = {}
 
-        fixture_files = files_to_read.map do |path|
-          table_name = path.tr '/', '_'
+          fixture_files = files_to_read.map do |path|
+            table_name = path.tr '/', '_'
 
-          fixtures_map[path] = Fixtures.new(
-            connection,
-            table_name,
-            class_names[table_name.to_sym] || table_name.classify,
-            File.join(fixtures_directory, path))
-        end
+            fixtures_map[path] = ActiveRecord::Fixtures.new(
+              connection,
+              table_name,
+              class_names[table_name.to_sym] || table_name.classify,
+              File.join(fixtures_directory, path))
+          end
 
-        all_loaded_fixtures.update(fixtures_map)
+          all_loaded_fixtures.update(fixtures_map)
 
-        connection.transaction(:requires_new => true) do
-          fixture_files.each do |ff|
-            conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
-            table_rows = ff.table_rows
+          connection.transaction(:requires_new => true) do
+            fixture_files.each do |ff|
+              conn = ff.model_class.respond_to?(:connection) ? ff.model_class.connection : connection
+              table_rows = ff.table_rows
 
-            table_rows.keys.each do |table|
-              conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
-            end
+              table_rows.keys.each do |table|
+                conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
+              end
 
-            table_rows.each do |table_name,rows|
-              rows.each do |row|
-                conn.insert_fixture(row, table_name)
+              table_rows.each do |table_name,rows|
+                rows.each do |row|
+                  conn.insert_fixture(row, table_name)
+                end
               end
             end
-          end
 
-          # Cap primary key sequences to max(pk).
-          if connection.respond_to?(:reset_pk_sequence!)
-            table_names.each do |table_name|
-              connection.reset_pk_sequence!(table_name.tr('/', '_'))
+            # Cap primary key sequences to max(pk).
+            if connection.respond_to?(:reset_pk_sequence!)
+              table_names.each do |table_name|
+                connection.reset_pk_sequence!(table_name.tr('/', '_'))
+              end
             end
           end
-        end
 
-        cache_fixtures(connection, fixtures_map)
+          cache_fixtures(connection, fixtures_map)
+        end
       end
+      cached_fixtures(connection, table_names)
     end
-    cached_fixtures(connection, table_names)
-  end
-
-  # Returns a consistent, platform-independent identifier for +label+.
-  # Identifiers are positive integers less than 2^32.
-  def self.identify(label)
-    Zlib.crc32(label.to_s) % MAX_ID
-  end
 
-  attr_reader :table_name, :name, :fixtures, :model_class
-
-  def initialize(connection, table_name, class_name, fixture_path)
-    @connection   = connection
-    @table_name   = table_name
-    @fixture_path = fixture_path
-    @name         = table_name # preserve fixture base name
-    @class_name   = class_name
-
-    @fixtures     = ActiveSupport::OrderedHash.new
-    @table_name   = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}"
-
-    # Should be an AR::Base type class
-    if class_name.is_a?(Class)
-      @table_name   = class_name.table_name
-      @connection   = class_name.connection
-      @model_class  = class_name
-    else
-      @model_class  = class_name.constantize rescue nil
+    # Returns a consistent, platform-independent identifier for +label+.
+    # Identifiers are positive integers less than 2^32.
+    def self.identify(label)
+      Zlib.crc32(label.to_s) % MAX_ID
     end
 
-    read_fixture_files
-  end
+    attr_reader :table_name, :name, :fixtures, :model_class
 
-  def [](x)
-    fixtures[x]
-  end
+    def initialize(connection, table_name, class_name, fixture_path)
+      @connection   = connection
+      @table_name   = table_name
+      @fixture_path = fixture_path
+      @name         = table_name # preserve fixture base name
+      @class_name   = class_name
 
-  def []=(k,v)
-    fixtures[k] = v
-  end
+      @fixtures     = ActiveSupport::OrderedHash.new
+      @table_name   = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}"
 
-  def each(&block)
-    fixtures.each(&block)
-  end
+      # Should be an AR::Base type class
+      if class_name.is_a?(Class)
+        @table_name   = class_name.table_name
+        @connection   = class_name.connection
+        @model_class  = class_name
+      else
+        @model_class  = class_name.constantize rescue nil
+      end
 
-  def size
-    fixtures.size
-  end
+      read_fixture_files
+    end
 
-  # Return a hash of rows to be inserted.  The key is the table, the value is
-  # a list of rows to insert to that table.
-  def table_rows
-    now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
-    now = now.to_s(:db)
+    def [](x)
+      fixtures[x]
+    end
 
-    # allow a standard key to be used for doing defaults in YAML
-    fixtures.delete('DEFAULTS')
+    def []=(k,v)
+      fixtures[k] = v
+    end
 
-    # track any join tables we need to insert later
-    rows = Hash.new { |h,table| h[table] = [] }
+    def each(&block)
+      fixtures.each(&block)
+    end
 
-    rows[table_name] = fixtures.map do |label, fixture|
-      row = fixture.to_hash
+    def size
+      fixtures.size
+    end
 
-      if model_class && model_class < ActiveRecord::Base
-        # fill in timestamp columns if they aren't specified and the model is set to record_timestamps
-        if model_class.record_timestamps
-          timestamp_column_names.each do |name|
-            row[name] = now unless row.key?(name)
-          end
-        end
+    # Return a hash of rows to be inserted.  The key is the table, the value is
+    # a list of rows to insert to that table.
+    def table_rows
+      now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+      now = now.to_s(:db)
 
-        # interpolate the fixture label
-        row.each do |key, value|
-          row[key] = label if value == "$LABEL"
-        end
+      # allow a standard key to be used for doing defaults in YAML
+      fixtures.delete('DEFAULTS')
 
-        # generate a primary key if necessary
-        if has_primary_key_column? && !row.include?(primary_key_name)
-          row[primary_key_name] = Fixtures.identify(label)
-        end
+      # track any join tables we need to insert later
+      rows = Hash.new { |h,table| h[table] = [] }
+
+      rows[table_name] = fixtures.map do |label, fixture|
+        row = fixture.to_hash
 
-        # If STI is used, find the correct subclass for association reflection
-        reflection_class =
-          if row.include?(inheritance_column_name)
-            row[inheritance_column_name].constantize rescue model_class
-          else
-            model_class
+        if model_class && model_class < ActiveRecord::Base
+          # fill in timestamp columns if they aren't specified and the model is set to record_timestamps
+          if model_class.record_timestamps
+            timestamp_column_names.each do |name|
+              row[name] = now unless row.key?(name)
+            end
           end
 
-        reflection_class.reflect_on_all_associations.each do |association|
-          case association.macro
-          when :belongs_to
-            # Do not replace association name with association foreign key if they are named the same
-            fk_name = (association.options[:foreign_key] || "#{association.name}_id").to_s
+          # interpolate the fixture label
+          row.each do |key, value|
+            row[key] = label if value == "$LABEL"
+          end
 
-            if association.name.to_s != fk_name && value = row.delete(association.name.to_s)
-              if association.options[:polymorphic] && value.sub!(/\s*\(([^\)]*)\)\s*$/, "")
-                # support polymorphic belongs_to as "label (Type)"
-                row[association.foreign_type] = $1
-              end
+          # generate a primary key if necessary
+          if has_primary_key_column? && !row.include?(primary_key_name)
+            row[primary_key_name] = ActiveRecord::Fixtures.identify(label)
+          end
 
-              row[fk_name] = Fixtures.identify(value)
+          # If STI is used, find the correct subclass for association reflection
+          reflection_class =
+            if row.include?(inheritance_column_name)
+              row[inheritance_column_name].constantize rescue model_class
+            else
+              model_class
             end
-          when :has_and_belongs_to_many
-            if (targets = row.delete(association.name.to_s))
-              targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
-              table_name = association.options[:join_table]
-              rows[table_name].concat targets.map { |target|
-                { association.foreign_key             => row[primary_key_name],
-                  association.association_foreign_key => Fixtures.identify(target) }
-              }
+
+          reflection_class.reflect_on_all_associations.each do |association|
+            case association.macro
+            when :belongs_to
+              # Do not replace association name with association foreign key if they are named the same
+              fk_name = (association.options[:foreign_key] || "#{association.name}_id").to_s
+
+              if association.name.to_s != fk_name && value = row.delete(association.name.to_s)
+                if association.options[:polymorphic] && value.sub!(/\s*\(([^\)]*)\)\s*$/, "")
+                  # support polymorphic belongs_to as "label (Type)"
+                  row[association.foreign_type] = $1
+                end
+
+                row[fk_name] = ActiveRecord::Fixtures.identify(value)
+              end
+            when :has_and_belongs_to_many
+              if (targets = row.delete(association.name.to_s))
+                targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
+                table_name = association.options[:join_table]
+                rows[table_name].concat targets.map { |target|
+                  { association.foreign_key             => row[primary_key_name],
+                    association.association_foreign_key => ActiveRecord::Fixtures.identify(target) }
+                }
+              end
             end
           end
         end
-      end
-
-      row
-    end
-    rows
-  end
 
-  private
-    def primary_key_name
-      @primary_key_name ||= model_class && model_class.primary_key
+        row
+      end
+      rows
     end
 
-    def has_primary_key_column?
-      @has_primary_key_column ||= primary_key_name &&
-        model_class.columns.any? { |c| c.name == primary_key_name }
-    end
+    private
+      def primary_key_name
+        @primary_key_name ||= model_class && model_class.primary_key
+      end
 
-    def timestamp_column_names
-      @timestamp_column_names ||=
-        %w(created_at created_on updated_at updated_on) & column_names
-    end
+      def has_primary_key_column?
+        @has_primary_key_column ||= primary_key_name &&
+          model_class.columns.any? { |c| c.name == primary_key_name }
+      end
 
-    def inheritance_column_name
-      @inheritance_column_name ||= model_class && model_class.inheritance_column
-    end
+      def timestamp_column_names
+        @timestamp_column_names ||=
+          %w(created_at created_on updated_at updated_on) & column_names
+      end
 
-    def column_names
-      @column_names ||= @connection.columns(@table_name).collect { |c| c.name }
-    end
+      def inheritance_column_name
+        @inheritance_column_name ||= model_class && model_class.inheritance_column
+      end
 
-    def read_fixture_files
-      if File.file?(yaml_file_path)
-        read_yaml_fixture_files
-      elsif File.file?(csv_file_path)
-        read_csv_fixture_files
-      else
-        raise FixturesFileNotFound, "Could not find #{yaml_file_path} or #{csv_file_path}"
+      def column_names
+        @column_names ||= @connection.columns(@table_name).collect { |c| c.name }
       end
-    end
 
-    def read_yaml_fixture_files
-      yaml_string = (Dir["#{@fixture_path}/**/*.yml"].select { |f|
-        File.file?(f)
-      } + [yaml_file_path]).map { |file_path| IO.read(file_path) }.join
-
-      if yaml = parse_yaml_string(yaml_string)
-        # If the file is an ordered map, extract its children.
-        yaml_value =
-          if yaml.respond_to?(:type_id) && yaml.respond_to?(:value)
-            yaml.value
-          else
-            [yaml]
-          end
+      def read_fixture_files
+        if File.file?(yaml_file_path)
+          read_yaml_fixture_files
+        elsif File.file?(csv_file_path)
+          read_csv_fixture_files
+        else
+          raise FixturesFileNotFound, "Could not find #{yaml_file_path} or #{csv_file_path}"
+        end
+      end
 
-        yaml_value.each do |fixture|
-          raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each)
-          fixture.each do |name, data|
-            unless data
-              raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+      def read_yaml_fixture_files
+        yaml_string = (Dir["#{@fixture_path}/**/*.yml"].select { |f|
+          File.file?(f)
+        } + [yaml_file_path]).map { |file_path| IO.read(file_path) }.join
+
+        if yaml = parse_yaml_string(yaml_string)
+          # If the file is an ordered map, extract its children.
+          yaml_value =
+            if yaml.respond_to?(:type_id) && yaml.respond_to?(:value)
+              yaml.value
+            else
+              [yaml]
             end
 
-            fixtures[name] = Fixture.new(data, model_class)
+          yaml_value.each do |fixture|
+            raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each)
+            fixture.each do |name, data|
+              unless data
+                raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+              end
+
+              fixtures[name] = ActiveRecord::Fixture.new(data, model_class)
+            end
           end
         end
       end
-    end
 
-    def read_csv_fixture_files
-      reader = CSV.parse(erb_render(IO.read(csv_file_path)))
-      header = reader.shift
-      i = 0
-      reader.each do |row|
-        data = {}
-        row.each_with_index { |cell, j| data[header[j].to_s.strip] = cell.to_s.strip }
-        fixtures["#{@class_name.to_s.underscore}_#{i+=1}"] = Fixture.new(data, model_class)
+      def read_csv_fixture_files
+        reader = CSV.parse(erb_render(IO.read(csv_file_path)))
+        header = reader.shift
+        i = 0
+        reader.each do |row|
+          data = {}
+          row.each_with_index { |cell, j| data[header[j].to_s.strip] = cell.to_s.strip }
+          fixtures["#{@class_name.to_s.underscore}_#{i+=1}"] = ActiveRecord::Fixture.new(data, model_class)
+        end
       end
-    end
+      deprecate :read_csv_fixture_files
 
-    def yaml_file_path
-      "#{@fixture_path}.yml"
-    end
+      def yaml_file_path
+        "#{@fixture_path}.yml"
+      end
 
-    def csv_file_path
-      @fixture_path + ".csv"
-    end
+      def csv_file_path
+        @fixture_path + ".csv"
+      end
 
-    def yaml_fixtures_key(path)
-      File.basename(@fixture_path).split(".").first
-    end
+      def yaml_fixtures_key(path)
+        File.basename(@fixture_path).split(".").first
+      end
 
-    def parse_yaml_string(fixture_content)
-      YAML::load(erb_render(fixture_content))
-    rescue => error
-      raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}"
-    end
+      def parse_yaml_string(fixture_content)
+        YAML::load(erb_render(fixture_content))
+      rescue => error
+        raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n  #{error.class}: #{error}"
+      end
 
-    def erb_render(fixture_content)
-      ERB.new(fixture_content).result
-    end
-end
+      def erb_render(fixture_content)
+        ERB.new(fixture_content).result
+      end
+  end
 
-class Fixture #:nodoc:
-  include Enumerable
+  class Fixture #:nodoc:
+    include Enumerable
 
-  class FixtureError < StandardError #:nodoc:
-  end
+    class FixtureError < StandardError #:nodoc:
+    end
 
-  class FormatError < FixtureError #:nodoc:
-  end
+    class FormatError < FixtureError #:nodoc:
+    end
 
-  attr_reader :model_class, :fixture
+    attr_reader :model_class, :fixture
 
-  def initialize(fixture, model_class)
-    @fixture     = fixture
-    @model_class = model_class
-  end
+    def initialize(fixture, model_class)
+      @fixture     = fixture
+      @model_class = model_class
+    end
 
-  def class_name
-    model_class.name if model_class
-  end
+    def class_name
+      model_class.name if model_class
+    end
 
-  def each
-    fixture.each { |item| yield item }
-  end
+    def each
+      fixture.each { |item| yield item }
+    end
 
-  def [](key)
-    fixture[key]
-  end
+    def [](key)
+      fixture[key]
+    end
 
-  alias :to_hash :fixture
+    alias :to_hash :fixture
 
-  def find
-    if model_class
-      model_class.find(fixture[model_class.primary_key])
-    else
-      raise FixtureClassNotFound, "No class attached to find."
+    def find
+      if model_class
+        model_class.find(fixture[model_class.primary_key])
+      else
+        raise FixtureClassNotFound, "No class attached to find."
+      end
     end
   end
 end
@@ -832,7 +787,7 @@ module ActiveRecord
       self.pre_loaded_fixtures = false
 
       self.fixture_class_names = Hash.new do |h, table_name|
-        h[table_name] = Fixtures.find_table_name(table_name)
+        h[table_name] = ActiveRecord::Fixtures.find_table_name(table_name)
       end
     end
 
@@ -944,7 +899,7 @@ module ActiveRecord
         ActiveRecord::Base.connection.begin_db_transaction
       # Load fixtures for every test.
       else
-        Fixtures.reset_cache
+        ActiveRecord::Fixtures.reset_cache
         @@already_loaded_fixtures[self.class] = nil
         @loaded_fixtures = load_fixtures
       end
@@ -957,7 +912,7 @@ module ActiveRecord
       return unless defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
 
       unless run_in_transaction?
-        Fixtures.reset_cache
+        ActiveRecord::Fixtures.reset_cache
       end
 
       # Rollback changes if a transaction is active.
@@ -970,7 +925,7 @@ module ActiveRecord
 
     private
       def load_fixtures
-        fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
+        fixtures = ActiveRecord::Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
         Hash[fixtures.map { |f| [f.name, f] }]
       end
 
@@ -979,16 +934,16 @@ module ActiveRecord
 
       def instantiate_fixtures
         if pre_loaded_fixtures
-          raise RuntimeError, 'Load fixtures before instantiating them.' if Fixtures.all_loaded_fixtures.empty?
+          raise RuntimeError, 'Load fixtures before instantiating them.' if ActiveRecord::Fixtures.all_loaded_fixtures.empty?
           unless @@required_fixture_classes
-            self.class.require_fixture_classes Fixtures.all_loaded_fixtures.keys
+            self.class.require_fixture_classes ActiveRecord::Fixtures.all_loaded_fixtures.keys
             @@required_fixture_classes = true
           end
-          Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
+          ActiveRecord::Fixtures.instantiate_all_loaded_fixtures(self, load_instances?)
         else
           raise RuntimeError, 'Load fixtures before instantiating them.' if @loaded_fixtures.nil?
           @loaded_fixtures.each do |fixture_name, fixtures|
-            Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
+            ActiveRecord::Fixtures.instantiate_fixtures(self, fixture_name, fixtures, load_instances?)
           end
         end
       end