radiant 0.6.4 → 0.6.5

data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -0,0 +1,34 @@
+require 'active_record/connection_adapters/sqlite_adapter'
+
+module ActiveRecord
+  class Base
+    # sqlite3 adapter reuses sqlite_connection.
+    def self.sqlite3_connection(config) # :nodoc:
+      parse_sqlite_config!(config)
+
+      unless self.class.const_defined?(:SQLite3)
+        require_library_or_gem(config[:adapter])
+      end
+
+      db = SQLite3::Database.new(
+        config[:database],
+        :results_as_hash => true,
+        :type_translation => false
+      )
+
+      db.busy_timeout(config[:timeout]) unless config[:timeout].nil?
+
+      ConnectionAdapters::SQLite3Adapter.new(db, logger)
+    end
+  end
+
+  module ConnectionAdapters #:nodoc:
+    class SQLite3Adapter < SQLiteAdapter # :nodoc:
+      def table_structure(table_name)
+        returning structure = @connection.table_info(table_name) do
+          raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
+        end
+      end
+    end
+  end
+end

data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -1,33 +1,11 @@
-# Author: Luke Holden <lholden@cablelan.net>
-# Updated for SQLite3: Jamis Buck <jamis@37signals.com>
-
 require 'active_record/connection_adapters/abstract_adapter'
 
 module ActiveRecord
   class Base
     class << self
-      # sqlite3 adapter reuses sqlite_connection.
-      def sqlite3_connection(config) # :nodoc:
-        parse_config!(config)
-
-        unless self.class.const_defined?(:SQLite3)
-          require_library_or_gem(config[:adapter])
-        end
-
-        db = SQLite3::Database.new(
-          config[:database],
-          :results_as_hash => true,
-          :type_translation => false
-        )
-
-        db.busy_timeout(config[:timeout]) unless config[:timeout].nil?
-
-        ConnectionAdapters::SQLite3Adapter.new(db, logger)
-      end
-
       # Establishes a connection to the database that's used by all Active Record objects
       def sqlite_connection(config) # :nodoc:
-        parse_config!(config)
+        parse_sqlite_config!(config)
 
         unless self.class.const_defined?(:SQLite)
           require_library_or_gem(config[:adapter])
@@ -47,7 +25,7 @@ module ActiveRecord
       end
 
       private
-        def parse_config!(config)
+        def parse_sqlite_config!(config)
           config[:database] ||= config[:dbfile]
           # Require database.
           unless config[:database]
@@ -56,7 +34,7 @@ module ActiveRecord
 
           # Allow database path relative to RAILS_ROOT, but only if
           # the database path is not the special path that tells
-          # Sqlite build a database only in memory.
+          # Sqlite to build a database only in memory.
           if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:database]
             config[:database] = File.expand_path(config[:database], RAILS_ROOT)
           end
@@ -73,16 +51,16 @@ module ActiveRecord
               when "\0" then "%00"
               when "%"  then "%25"
             end
-          end                
+          end
         end
-        
+
         def binary_to_string(value)
           value.gsub(/%00|%25/n) do |b|
             case b
               when "%00" then "\0"
               when "%25" then "%"
             end
-          end                
+          end
         end
       end
     end
@@ -105,14 +83,23 @@ module ActiveRecord
       def requires_reloading?
         true
       end
-      
+ 
+      def disconnect!
+        super
+        @connection.close rescue nil
+      end
+
       def supports_count_distinct? #:nodoc:
-        false
+        sqlite_version >= '3.2.6'
+      end
+
+      def supports_autoincrement? #:nodoc:
+        sqlite_version >= '3.1.0'
       end
 
       def native_database_types #:nodoc:
         {
-          :primary_key => "INTEGER PRIMARY KEY NOT NULL",
+          :primary_key => default_primary_key_type,
           :string      => { :name => "varchar", :limit => 255 },
           :text        => { :name => "text" },
           :integer     => { :name => "integer" },
@@ -145,44 +132,30 @@ module ActiveRecord
         catch_schema_changes { log(sql, name) { @connection.execute(sql) } }
       end
 
-      def update(sql, name = nil) #:nodoc:
-        execute(sql, name)
+      def update_sql(sql, name = nil) #:nodoc:
+        super
         @connection.changes
       end
 
-      def delete(sql, name = nil) #:nodoc:
+      def delete_sql(sql, name = nil) #:nodoc:
         sql += " WHERE 1=1" unless sql =~ /WHERE/i
-        execute(sql, name)
-        @connection.changes
+        super sql, name
       end
 
-      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-        execute(sql, name = nil)
-        id_value || @connection.last_insert_row_id
+      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+        super || @connection.last_insert_row_id
       end
 
-      def select_all(sql, name = nil) #:nodoc:
+      def select_rows(sql, name = nil)
         execute(sql, name).map do |row|
-          record = {}
-          row.each_key do |key|
-            if key.is_a?(String)
-              record[key.sub(/^\w+\./, '')] = row[key]
-            end
-          end
-          record
+          (0...(row.size / 2)).map { |i| row[i] }
         end
       end
 
-      def select_one(sql, name = nil) #:nodoc:
-        result = select_all(sql, name)
-        result.nil? ? nil : result.first
-      end
-
-
       def begin_db_transaction #:nodoc:
         catch_schema_changes { @connection.transaction }
       end
-      
+
       def commit_db_transaction #:nodoc:
         catch_schema_changes { @connection.commit }
       end
@@ -201,7 +174,13 @@ module ActiveRecord
       # SCHEMA STATEMENTS ========================================
 
       def tables(name = nil) #:nodoc:
-        execute("SELECT name FROM sqlite_master WHERE type = 'table'", name).map do |row|
+        sql = <<-SQL
+          SELECT name
+          FROM sqlite_master
+          WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+        SQL
+
+        execute(sql, name).map do |row|
           row[0]
         end
       end
@@ -229,7 +208,7 @@ module ActiveRecord
       def remove_index(table_name, options={}) #:nodoc:
         execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
       end
-      
+
       def rename_table(name, new_name)
         execute "ALTER TABLE #{name} RENAME TO #{new_name}"
       end
@@ -239,13 +218,13 @@ module ActiveRecord
         # See last paragraph on http://www.sqlite.org/lang_altertable.html
         execute "VACUUM"
       end
-      
+
       def remove_column(table_name, column_name) #:nodoc:
         alter_table(table_name) do |definition|
           definition.columns.delete(definition[column_name])
         end
       end
-      
+
       def change_column_default(table_name, column_name, default) #:nodoc:
         alter_table(table_name) do |definition|
           definition[column_name].default = default
@@ -259,60 +238,78 @@ module ActiveRecord
             self.type    = type
             self.limit   = options[:limit] if options.include?(:limit)
             self.default = options[:default] if include_default
+            self.null    = options[:null] if options.include?(:null)
           end
         end
       end
 
       def rename_column(table_name, column_name, new_column_name) #:nodoc:
-        alter_table(table_name, :rename => {column_name => new_column_name})
+        alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
+      end
+
+      def empty_insert_statement(table_name)
+        "INSERT INTO #{table_name} VALUES(NULL)"
       end
-          
 
       protected
+        def select(sql, name = nil) #:nodoc:
+          execute(sql, name).map do |row|
+            record = {}
+            row.each_key do |key|
+              if key.is_a?(String)
+                record[key.sub(/^\w+\./, '')] = row[key]
+              end
+            end
+            record
+          end
+        end
+
         def table_structure(table_name)
           returning structure = execute("PRAGMA table_info(#{table_name})") do
-            raise ActiveRecord::StatementInvalid if structure.empty?
+            raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
           end
         end
-        
+
         def alter_table(table_name, options = {}) #:nodoc:
           altered_table_name = "altered_#{table_name}"
           caller = lambda {|definition| yield definition if block_given?}
 
           transaction do
-            move_table(table_name, altered_table_name, 
+            move_table(table_name, altered_table_name,
               options.merge(:temporary => true))
             move_table(altered_table_name, table_name, &caller)
           end
         end
-        
+
         def move_table(from, to, options = {}, &block) #:nodoc:
           copy_table(from, to, options, &block)
           drop_table(from)
         end
-        
+
         def copy_table(from, to, options = {}) #:nodoc:
-          create_table(to, options) do |@definition|
+          options = options.merge(:id => !columns(from).detect{|c| c.name == 'id'}.nil?)
+          create_table(to, options) do |definition|
+            @definition = definition
             columns(from).each do |column|
               column_name = options[:rename] ?
                 (options[:rename][column.name] ||
                  options[:rename][column.name.to_sym] ||
                  column.name) : column.name
-
-              @definition.column(column_name, column.type, 
+              
+              @definition.column(column_name, column.type,
                 :limit => column.limit, :default => column.default,
                 :null => column.null)
             end
-            @definition.primary_key(primary_key(from))
+            @definition.primary_key(primary_key(from)) if primary_key(from)
             yield @definition if block_given?
           end
-          
+
           copy_table_indexes(from, to)
-          copy_table_contents(from, to, 
-            @definition.columns.map {|column| column.name}, 
+          copy_table_contents(from, to,
+            @definition.columns.map {|column| column.name},
             options[:rename] || {})
         end
-        
+
         def copy_table_indexes(from, to) #:nodoc:
           indexes(from).each do |index|
             name = index.name
@@ -321,27 +318,29 @@ module ActiveRecord
             elsif from == "altered_#{to}"
               name = name[5..-1]
             end
-            
+
             # index name can't be the same
             opts = { :name => name.gsub(/_(#{from})_/, "_#{to}_") }
             opts[:unique] = true if index.unique
             add_index(to, index.columns, opts)
           end
         end
-        
+
         def copy_table_contents(from, to, columns, rename = {}) #:nodoc:
           column_mappings = Hash[*columns.map {|name| [name, name]}.flatten]
           rename.inject(column_mappings) {|map, a| map[a.last] = a.first; map}
           from_columns = columns(from).collect {|col| col.name}
           columns = columns.find_all{|col| from_columns.include?(column_mappings[col])}
+          quoted_columns = columns.map { |col| quote_column_name(col) } * ','
+
           @connection.execute "SELECT * FROM #{from}" do |row|
-            sql = "INSERT INTO #{to} ("+columns*','+") VALUES ("            
+            sql = "INSERT INTO #{to} (#{quoted_columns}) VALUES ("
             sql << columns.map {|col| quote row[column_mappings[col]]} * ', '
             sql << ')'
             @connection.execute sql
           end
         end
-        
+
         def catch_schema_changes
           return yield
         rescue ActiveRecord::StatementInvalid => exception
@@ -352,49 +351,34 @@ module ActiveRecord
             raise
           end
         end
-    end
-    
-    class SQLite3Adapter < SQLiteAdapter # :nodoc:
-      def table_structure(table_name)
-        returning structure = @connection.table_info(table_name) do
-          raise ActiveRecord::StatementInvalid if structure.empty?
+
+        def sqlite_version
+          @sqlite_version ||= select_value('select sqlite_version(*)')
+        end
+
+        def default_primary_key_type
+          if supports_autoincrement?
+            'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL'.freeze
+          else
+            'INTEGER PRIMARY KEY NOT NULL'.freeze
+          end
         end
-      end
     end
 
     class SQLite2Adapter < SQLiteAdapter # :nodoc:
-      # SQLite 2 does not support COUNT(DISTINCT) queries:
-      #
-      #   select COUNT(DISTINCT ArtistID) from CDs;    
-      #
-      # In order to get  the number of artists we execute the following statement
-      # 
-      #   SELECT COUNT(ArtistID) FROM (SELECT DISTINCT ArtistID FROM CDs);
-      def execute(sql, name = nil) #:nodoc:
-        super(rewrite_count_distinct_queries(sql), name)
-      end
-      
-      def rewrite_count_distinct_queries(sql)
-        if sql =~ /count\(distinct ([^\)]+)\)( AS \w+)? (.*)/i
-          distinct_column = $1
-          distinct_query  = $3
-          column_name     = distinct_column.split('.').last
-          "SELECT COUNT(#{column_name}) FROM (SELECT DISTINCT #{distinct_column} #{distinct_query})"
-        else
-          sql
-        end
+      def supports_count_distinct? #:nodoc:
+        false
       end
-      
+
       def rename_table(name, new_name)
         move_table(name, new_name)
       end
-      
+
       def add_column(table_name, column_name, type, options = {}) #:nodoc:
         alter_table(table_name) do |definition|
           definition.column(column_name, type, options)
         end
       end
-      
     end
 
     class DeprecatedSQLiteAdapter < SQLite2Adapter # :nodoc:

data/vendor/rails/activerecord/lib/active_record/fixtures.rb

@@ -9,10 +9,15 @@ module YAML #:nodoc:
   end
 end
 
-class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
+if defined? ActiveRecord
+  class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc:
+  end
+else
+  class FixtureClassNotFound < StandardError #:nodoc:
+  end
 end
 
-# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours:
+# Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavors:
 #
 #   1.  YAML fixtures
 #   2.  CSV fixtures
@@ -21,7 +26,7 @@ end
 # = YAML fixtures
 #
 # This type of fixture is in YAML format and the preferred default. YAML is a file format which describes data structures
-# in a non-verbose, humanly-readable format. It ships with Ruby 1.8.1+.
+# in a non-verbose, human-readable format. It ships with Ruby 1.8.1+.
 #
 # Unlike single-file fixtures, YAML fixtures are stored in a single file per model, which are placed in the directory appointed
 # by <tt>Test::Unit::TestCase.fixture_path=(path)</tt> (this is automatically configured for Rails, so you can just
@@ -82,7 +87,7 @@ end
 #
 # = Single-file fixtures
 #
-# This type of fixtures was the original format for Active Record that has since been deprecated in favor of the YAML and CSV formats.
+# 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>Test::Unit::TestCase.fixture_path=(path)</tt> (this is automatically configured for Rails, so you can just
 # put your files in <your-rails-app>/test/fixtures/<your-model-name>/ -- like <your-rails-app>/test/fixtures/web_sites/ for the WebSite
@@ -106,7 +111,7 @@ end
 # = Using Fixtures
 #
 # Since fixtures are a testing construct, we use them in our unit and functional tests.  There are two ways to use the
-# fixtures, but first let's take a look at a sample unit test found:
+# fixtures, but first let's take a look at a sample unit test:
 #
 #   require 'web_site'
 #
@@ -124,8 +129,8 @@ end
 #     fixtures :web_sites # add more by separating the symbols with commas
 #   ...
 #
-# By adding a "fixtures" method to the test case and passing it a list of symbols (only one is shown here tho), we trigger
-# the testing environment to automatically load the appropriate fixtures into the database before each test.  
+# By adding a "fixtures" method to the test case and passing it a list of symbols (only one is shown here though), we trigger
+# the testing environment to automatically load the appropriate fixtures into the database before each test.
 # To ensure consistent data, the environment deletes the fixtures before running the load.
 #
 # In addition to being available in the database, the fixtures are also loaded into a hash stored in an instance variable
@@ -151,7 +156,7 @@ end
 #       self.use_instantiated_fixtures = false
 #
 #   - to keep the fixture instance (@web_sites) available, but do not automatically 'find' each instance:
-#       self.use_instantiated_fixtures = :no_instances 
+#       self.use_instantiated_fixtures = :no_instances
 #
 # Even if auto-instantiated fixtures are disabled, you can still access them
 # by name via special dynamic methods. Each method has the same name as the
@@ -183,7 +188,7 @@ end
 #
 # = Transactional fixtures
 #
-# TestCases can use begin+rollback to isolate their changes to the database instead of having to delete+insert for every test case. 
+# TestCases can use begin+rollback to isolate their changes to the database instead of having to delete+insert for every test case.
 # They can also turn off auto-instantiation of fixture data since the feature is costly and often unused.
 #
 #   class FooTest < Test::Unit::TestCase
@@ -203,22 +208,269 @@ end
 #     end
 #   end
 #   
-# If you preload your test database with all fixture data (probably in the Rakefile task) and use transactional fixtures, 
+# If you preload your test database with all fixture data (probably in the Rakefile task) and use transactional fixtures,
 # then you may omit all fixtures declarations in your test cases since all the data's already there and every case rolls back its changes.
 #
-# In order to use instantiated fixtures with preloaded data, set +self.pre_loaded_fixtures+ to true. This will provide 
+# In order to use instantiated fixtures with preloaded data, set +self.pre_loaded_fixtures+ to true. This will provide
 # access to fixture data for every table that has been loaded through fixtures (depending on the value of +use_instantiated_fixtures+)
 #
-# When *not* to use transactional fixtures: 
-#   1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit, 
-#      particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify 
-#      the results of your transaction until Active Record supports nested transactions or savepoints (in progress.) 
-#   2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM. 
+# When *not* to use transactional fixtures:
+#   1. You're testing whether a transaction works correctly. Nested transactions don't commit until all parent transactions commit,
+#      particularly, the fixtures transaction which is begun in setup and rolled back in teardown. Thus, you won't be able to verify
+#      the results of your transaction until Active Record supports nested transactions or savepoints (in progress).
+#   2. Your database does not support transactions. Every Active Record database supports transactions except MySQL MyISAM.
 #      Use InnoDB, MaxDB, or NDB instead.
+#
+# = Advanced YAML Fixtures
+#
+# YAML fixtures that don't specify an ID get some extra features:
+#
+# * Stable, autogenerated ID's
+# * Label references for associations (belongs_to, has_one, has_many)
+# * HABTM associations as inline lists
+# * Autofilled timestamp columns
+# * Fixture label interpolation
+# * Support for YAML defaults
+#
+# == Stable, autogenerated ID's
+#
+# Here, have a monkey fixture:
+#
+#   george:
+#     id: 1
+#     name: George the Monkey
+#
+#   reginald:
+#     id: 2
+#     name: Reginald the Pirate
+#
+# Each of these fixtures has two unique identifiers: one for the database
+# and one for the humans. Why don't we generate the primary key instead?
+# Hashing each fixture's label yields a consistent ID:
+#
+#   george: # generated id: 503576764
+#     name: George the Monkey
+#
+#   reginald: # generated id: 324201669
+#     name: Reginald the Pirate
+#
+# ActiveRecord looks at the fixture's model class, discovers the correct
+# primary key, and generates it right before inserting the fixture
+# into the database.
+#
+# The generated ID for a given label is constant, so we can discover
+# any fixture's ID without loading anything, as long as we know the label.
+#
+# == Label references for associations (belongs_to, has_one, has_many)
+#
+# Specifying foreign keys in fixtures can be very fragile, not to
+# mention difficult to read. Since ActiveRecord can figure out the ID of
+# any fixture from its label, you can specify FK's by label instead of ID.
+#
+# === belongs_to
+#
+# Let's break out some more monkeys and pirates.
+#
+#   ### in pirates.yml
+#
+#   reginald:
+#     id: 1
+#     name: Reginald the Pirate
+#     monkey_id: 1
+#
+#   ### in monkeys.yml
+#
+#   george:
+#     id: 1
+#     name: George the Monkey
+#     pirate_id: 1
+#
+# Add a few more monkeys and pirates and break this into multiple files,
+# and it gets pretty hard to keep track of what's going on. Let's
+# use labels instead of ID's:
+#
+#   ### in pirates.yml
+#
+#   reginald:
+#     name: Reginald the Pirate
+#     monkey: george
+#
+#   ### in monkeys.yml
+#
+#   george:
+#     name: George the Monkey
+#     pirate: reginald
+#
+# Pow! All is made clear. ActiveRecord reflects on the fixture's model class,
+# finds all the +belongs_to+ associations, and allows you to specify
+# a target *label* for the *association* (monkey: george) rather than
+# a target *id* for the *FK* (monkey_id: 1).
+#
+# ==== Polymorphic belongs_to
+#
+# Supporting polymorphic relationships is a little bit more complicated, since
+# ActiveRecord needs to know what type your association is pointing at. Something
+# like this should look familiar:
+#
+#   ### in fruit.rb
+#
+#   belongs_to :eater, :polymorphic => true
+#
+#   ### in fruits.yml
+#
+#   apple:
+#     id: 1
+#     name: apple
+#     eater_id: 1
+#     eater_type: Monkey
+#
+# Can we do better? You bet!
+#
+#   apple:
+#     eater: george (Monkey)
+#
+# Just provide the polymorphic target type and ActiveRecord will take care of the rest.
+#
+# === has_and_belongs_to_many
+#
+# Time to give our monkey some fruit.
+#
+#   ### in monkeys.yml
+#
+#   george:
+#     id: 1
+#     name: George the Monkey
+#     pirate_id: 1
+#
+#   ### in fruits.yml
+#
+#   apple:
+#     id: 1
+#     name: apple
+#
+#   orange:
+#     id: 2
+#     name: orange
+#
+#   grape:
+#     id: 3
+#     name: grape
+#
+#   ### in fruits_monkeys.yml
+#
+#   apple_george:
+#     fruit_id: 1
+#     monkey_id: 1
+#
+#   orange_george:
+#     fruit_id: 2
+#     monkey_id: 1
+#
+#   grape_george:
+#     fruit_id: 3
+#     monkey_id: 1
+#
+# Let's make the HABTM fixture go away.
+#
+#   ### in monkeys.yml
+#
+#   george:
+#     name: George the Monkey
+#     pirate: reginald
+#     fruits: apple, orange, grape
+#
+#   ### in fruits.yml
+#
+#   apple:
+#     name: apple
+#
+#   orange:
+#     name: orange
+#
+#   grape:
+#     name: grape
+#
+# Zap! No more fruits_monkeys.yml file. We've specified the list of fruits
+# on George's fixture, but we could've just as easily specified a list
+# of monkeys on each fruit. As with +belongs_to+, ActiveRecord reflects on
+# the fixture's model class and discovers the +has_and_belongs_to_many+
+# associations.
+#
+# == Autofilled timestamp columns
+#
+# If your table/model specifies any of ActiveRecord's
+# standard timestamp columns (created_at, created_on, updated_at, updated_on),
+# they will automatically be set to Time.now.
+#
+# If you've set specific values, they'll be left alone.
+#
+# == Fixture label interpolation
+#
+# The label of the current fixture is always available as a column value:
+#
+#   geeksomnia:
+#     name: Geeksomnia's Account
+#     subdomain: $LABEL
+#
+# Also, sometimes (like when porting older join table fixtures) you'll need
+# to be able to get ahold of the identifier for a given label. ERB
+# to the rescue:
+#
+#   george_reginald:
+#     monkey_id: <%= Fixtures.identify(:reginald) %>
+#     pirate_id: <%= Fixtures.identify(:george) %>
+#
+# == Support for YAML defaults
+#
+# You probably already know how to use YAML to set and reuse defaults in
+# your +database.yml+ file,. You can use the same technique in your fixtures:
+#
+#   DEFAULTS: &DEFAULTS
+#     created_on: <%= 3.weeks.ago.to_s(:db) %>
+#
+#   first:
+#     name: Smurf
+#     <<: *DEFAULTS
+#
+#   second:
+#     name: Fraggle
+#     <<: *DEFAULTS
+#
+# Any fixture labeled "DEFAULTS" is safely ignored.
+
 class Fixtures < YAML::Omap
   DEFAULT_FILTER_RE = /\.ya?ml$/
 
-  def self.instantiate_fixtures(object, table_name, fixtures, load_instances=true)
+  @@all_cached_fixtures = {}
+
+  def self.reset_cache(connection = nil)
+    connection ||= ActiveRecord::Base.connection
+    @@all_cached_fixtures[connection.object_id] = {}
+  end
+
+  def self.cache_for_connection(connection)
+    @@all_cached_fixtures[connection.object_id] ||= {}
+    @@all_cached_fixtures[connection.object_id]
+  end
+
+  def self.fixture_is_cached?(connection, table_name)
+    cache_for_connection(connection)[table_name]
+  end
+
+  def self.cached_fixtures(connection, keys_to_fetch = nil)
+    if keys_to_fetch
+      fixtures = cache_for_connection(connection).values_at(*keys_to_fetch)
+    else
+      fixtures = cache_for_connection(connection).values
+    end
+    fixtures.size > 1 ? fixtures : fixtures.first
+  end
+
+  def self.cache_fixtures(connection, fixtures)
+    cache_for_connection(connection).update(fixtures.index_by(&:table_name))
+  end
+
+  def self.instantiate_fixtures(object, table_name, fixtures, load_instances = true)
     object.instance_variable_set "@#{table_name.to_s.gsub('.','_')}", fixtures
     if load_instances
       ActiveRecord::Base.silence do
@@ -233,47 +485,63 @@ class Fixtures < YAML::Omap
     end
   end
 
-  def self.instantiate_all_loaded_fixtures(object, load_instances=true)
+  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)
     end
   end
-  
+
   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 }
-    connection = block_given? ? yield : ActiveRecord::Base.connection
-    ActiveRecord::Base.silence do
-      fixtures_map = {}
-      fixtures = table_names.map do |table_name|
-        fixtures_map[table_name] = Fixtures.new(connection, File.split(table_name.to_s).last, class_names[table_name.to_sym], File.join(fixtures_directory, table_name.to_s))
-      end               
-      all_loaded_fixtures.merge! fixtures_map  
-
-      connection.transaction(Thread.current['open_transactions'] == 0) do
-        fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
-        fixtures.each { |fixture| fixture.insert_fixtures }
-
-        # 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)
+    connection  = block_given? ? yield : ActiveRecord::Base.connection
+
+    table_names_to_fetch = table_names.reject { |table_name| fixture_is_cached?(connection, table_name) }
+
+    unless table_names_to_fetch.empty?
+      ActiveRecord::Base.silence do
+        connection.disable_referential_integrity do
+          fixtures_map = {}
+
+          fixtures = table_names_to_fetch.map do |table_name|
+            fixtures_map[table_name] = Fixtures.new(connection, File.split(table_name.to_s).last, class_names[table_name.to_sym], File.join(fixtures_directory, table_name.to_s))
+          end
+
+          all_loaded_fixtures.update(fixtures_map)
+
+          connection.transaction(Thread.current['open_transactions'].to_i == 0) do
+            fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
+            fixtures.each { |fixture| fixture.insert_fixtures }
+
+            # 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)
+              end
+            end
           end
+
+          cache_fixtures(connection, fixtures)
         end
       end
-
-      return fixtures.size > 1 ? fixtures : fixtures.first
     end
+    cached_fixtures(connection, table_names)
   end
 
+  # Returns a consistent identifier for +label+. This will always
+  # be a positive integer, and will always be the same for a given
+  # label, assuming the same OS, platform, and version of Ruby.
+  def self.identify(label)
+    label.to_s.hash.abs
+  end
 
   attr_reader :table_name
 
   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
-    @class_name = class_name || 
+    @class_name = class_name ||
                   (ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize)
     @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)
@@ -282,63 +550,132 @@ class Fixtures < YAML::Omap
   end
 
   def delete_existing_fixtures
-    @connection.delete "DELETE FROM #{@table_name}", 'Fixture Delete'
+    @connection.delete "DELETE FROM #{@connection.quote_table_name(table_name)}", 'Fixture Delete'
   end
 
   def insert_fixtures
-    values.each do |fixture|
-      @connection.execute "INSERT INTO #{@table_name} (#{fixture.key_list}) VALUES (#{fixture.value_list})", 'Fixture Insert'
+    now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+    now = now.to_s(:db)
+
+    # allow a standard key to be used for doing defaults in YAML
+    delete(assoc("DEFAULTS"))
+
+    # track any join tables we need to insert later
+    habtm_fixtures = Hash.new do |h, habtm|
+      h[habtm] = HabtmFixtures.new(@connection, habtm.options[:join_table], nil, nil)
     end
-  end
 
-  private
+    each do |label, fixture|
+      row = fixture.to_hash
 
-    def read_fixture_files
-      if File.file?(yaml_file_path)
-        # YAML fixtures
-        yaml_string = ""
-        Dir["#{@fixture_path}/**/*.yml"].select {|f| test(?f,f) }.each do |subfixture_path|
-          yaml_string << IO.read(subfixture_path)
+      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
-        yaml_string << IO.read(yaml_file_path)
 
-        begin
-          yaml = YAML::load(erb_render(yaml_string))
-        rescue Exception=>boom
-          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  #{boom.class}: #{boom}"
+        # interpolate the fixture label
+        row.each do |key, value|
+          row[key] = label if value == "$LABEL"
         end
 
-        if yaml
-          # 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
+        # generate a primary key if necessary
+        if has_primary_key_column? && !row.include?(primary_key_name)
+          row[primary_key_name] = Fixtures.identify(label)
+        end
+
+        # 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
+
+        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]
+                if value.sub!(/\s*\(([^\)]*)\)\s*$/, "")
+                  target_type = $1
+                  target_type_name = (association.options[:foreign_type] || "#{association.name}_type").to_s
 
-          yaml_value.each do |fixture|
-            fixture.each do |name, data|
-              unless data
-                raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+                  # support polymorphic belongs_to as "label (Type)"
+                  row[target_type_name] = target_type
+                end
               end
 
-              self[name] = Fixture.new(data, @class_name)
+              row[fk_name] = 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*/)
+              join_fixtures = habtm_fixtures[association]
+
+              targets.each do |target|
+                join_fixtures["#{label}_#{target}"] = Fixture.new(
+                  { association.primary_key_name => row[primary_key_name],
+                    association.association_foreign_key => Fixtures.identify(target) }, nil)
+              end
             end
           end
         end
+      end
+
+      @connection.insert_fixture(fixture, @table_name)
+    end
+
+    # insert any HABTM join tables we discovered
+    habtm_fixtures.values.each do |fixture|
+      fixture.delete_existing_fixtures
+      fixture.insert_fixtures
+    end
+  end
+
+  private
+    class HabtmFixtures < ::Fixtures #:nodoc:
+      def read_fixture_files; end
+    end
+
+    def model_class
+      @model_class ||= @class_name.is_a?(Class) ?
+        @class_name : @class_name.constantize rescue nil
+    end
+
+    def primary_key_name
+      @primary_key_name ||= model_class && model_class.primary_key
+    end
+
+    def has_primary_key_column?
+      @has_primary_key_column ||= model_class && primary_key_name &&
+        model_class.columns.find { |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)
+      end
+    end
+
+    def inheritance_column_name
+      @inheritance_column_name ||= model_class && model_class.inheritance_column
+    end
+
+    def column_names
+      @column_names ||= @connection.columns(@table_name).collect(&:name)
+    end
+
+    def read_fixture_files
+      if File.file?(yaml_file_path)
+        read_yaml_fixture_files
       elsif File.file?(csv_file_path)
-        # CSV fixtures
-        reader = CSV::Reader.create(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 }
-          self["#{Inflector::underscore(@class_name)}_#{i+=1}"]= Fixture.new(data, @class_name)
-        end
-      elsif File.file?(deprecated_yaml_file_path)
-        raise Fixture::FormatError, ".yml extension required: rename #{deprecated_yaml_file_path} to #{yaml_file_path}"
+        read_csv_fixture_files
       else
         # Standard fixtures
         Dir.entries(@fixture_path).each do |file|
@@ -350,12 +687,47 @@ class Fixtures < YAML::Omap
       end
     end
 
-    def yaml_file_path
-      "#{@fixture_path}.yml"
+    def read_yaml_fixture_files
+      yaml_string = ""
+      Dir["#{@fixture_path}/**/*.yml"].select { |f| test(?f, f) }.each do |subfixture_path|
+        yaml_string << IO.read(subfixture_path)
+      end
+      yaml_string << IO.read(yaml_file_path)
+
+      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
+
+        yaml_value.each do |fixture|
+          fixture.each do |name, data|
+            unless data
+              raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)"
+            end
+
+            self[name] = Fixture.new(data, @class_name)
+          end
+        end
+      end
+    end
+
+    def read_csv_fixture_files
+      reader = CSV::Reader.create(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 }
+        self["#{Inflector::underscore(@class_name)}_#{i+=1}"]= Fixture.new(data, @class_name)
+      end
     end
 
-    def deprecated_yaml_file_path
-      "#{@fixture_path}.yaml"
+    def yaml_file_path
+      "#{@fixture_path}.yml"
     end
 
     def csv_file_path
@@ -366,6 +738,12 @@ class Fixtures < YAML::Omap
       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 erb_render(fixture_content)
       ERB.new(fixture_content).result
     end
@@ -373,11 +751,15 @@ end
 
 class Fixture #:nodoc:
   include Enumerable
-  class FixtureError < StandardError#:nodoc:
+
+  class FixtureError < StandardError #:nodoc:
   end
-  class FormatError < FixtureError#:nodoc:
+
+  class FormatError < FixtureError #:nodoc:
   end
 
+  attr_reader :class_name
+
   def initialize(fixture, class_name)
     case fixture
       when Hash, YAML::Omap
@@ -450,36 +832,40 @@ end
 module Test #:nodoc:
   module Unit #:nodoc:
     class TestCase #:nodoc:
-      cattr_accessor :fixture_path
-      class_inheritable_accessor :fixture_table_names
-      class_inheritable_accessor :fixture_class_names
-      class_inheritable_accessor :use_transactional_fixtures
-      class_inheritable_accessor :use_instantiated_fixtures   # true, false, or :no_instances
-      class_inheritable_accessor :pre_loaded_fixtures
+      superclass_delegating_accessor :fixture_path
+      superclass_delegating_accessor :fixture_table_names
+      superclass_delegating_accessor :fixture_class_names
+      superclass_delegating_accessor :use_transactional_fixtures
+      superclass_delegating_accessor :use_instantiated_fixtures   # true, false, or :no_instances
+      superclass_delegating_accessor :pre_loaded_fixtures
 
       self.fixture_table_names = []
       self.use_transactional_fixtures = false
       self.use_instantiated_fixtures = true
       self.pre_loaded_fixtures = false
-      
-      self.fixture_class_names = {}
-      
+
       @@already_loaded_fixtures = {}
       self.fixture_class_names = {}
-      
+
       def self.set_fixture_class(class_names = {})
         self.fixture_class_names = self.fixture_class_names.merge(class_names)
       end
-      
+
       def self.fixtures(*table_names)
-        table_names = table_names.flatten.map { |n| n.to_s }
+        if table_names.first == :all
+          table_names = Dir["#{fixture_path}/*.yml"] + Dir["#{fixture_path}/*.csv"]
+          table_names.map! { |f| File.basename(f).split('.')[0..-2].join('.') }
+        else
+          table_names = table_names.flatten.map { |n| n.to_s }
+        end
+
         self.fixture_table_names |= table_names
         require_fixture_classes(table_names)
         setup_fixture_accessors(table_names)
       end
 
-      def self.require_fixture_classes(table_names=nil)
-        (table_names || fixture_table_names).each do |table_name| 
+      def self.require_fixture_classes(table_names = nil)
+        (table_names || fixture_table_names).each do |table_name|
           file_name = table_name.to_s
           file_name = file_name.singularize if ActiveRecord::Base.pluralize_table_names
           begin
@@ -490,18 +876,26 @@ module Test #:nodoc:
         end
       end
 
-      def self.setup_fixture_accessors(table_names=nil)
+      def self.setup_fixture_accessors(table_names = nil)
         (table_names || fixture_table_names).each do |table_name|
-          table_name = table_name.to_s.tr('.','_')
-          define_method(table_name) do |fixture, *optionals|
-            force_reload = optionals.shift
-            @fixture_cache[table_name] ||= Hash.new
-            @fixture_cache[table_name][fixture] = nil if force_reload
-            if @loaded_fixtures[table_name][fixture.to_s]
-              @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
-            else
-              raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+          table_name = table_name.to_s.tr('.', '_')
+
+          define_method(table_name) do |*fixtures|
+            force_reload = fixtures.pop if fixtures.last == true || fixtures.last == :reload
+
+            @fixture_cache[table_name] ||= {}
+
+            instances = fixtures.map do |fixture|
+              @fixture_cache[table_name].delete(fixture) if force_reload
+
+              if @loaded_fixtures[table_name][fixture.to_s]
+                @fixture_cache[table_name][fixture] ||= @loaded_fixtures[table_name][fixture.to_s].find
+              else
+                raise StandardError, "No fixture with name '#{fixture}' found for table '#{table_name}'"
+              end
             end
+
+            instances.size == 1 ? instances.first : instances
           end
         end
       end
@@ -522,13 +916,15 @@ module Test #:nodoc:
       end
 
       def setup_with_fixtures
+        return if @fixtures_setup
+        @fixtures_setup = true
         return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
 
         if pre_loaded_fixtures && !use_transactional_fixtures
-          raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures' 
+          raise RuntimeError, 'pre_loaded_fixtures requires use_transactional_fixtures'
         end
 
-        @fixture_cache = Hash.new
+        @fixture_cache = {}
 
         # Load fixtures once and begin transaction.
         if use_transactional_fixtures?
@@ -540,9 +936,9 @@ module Test #:nodoc:
           end
           ActiveRecord::Base.send :increment_open_transactions
           ActiveRecord::Base.connection.begin_db_transaction
-
         # Load fixtures for every test.
         else
+          Fixtures.reset_cache
           @@already_loaded_fixtures[self.class] = nil
           load_fixtures
         end
@@ -550,12 +946,17 @@ module Test #:nodoc:
         # Instantiate fixtures for every test if requested.
         instantiate_fixtures if use_instantiated_fixtures
       end
-
       alias_method :setup, :setup_with_fixtures
 
       def teardown_with_fixtures
+        return if @fixtures_teardown
+        @fixtures_teardown = true
         return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
 
+        unless use_transactional_fixtures?
+          Fixtures.reset_cache
+        end
+
         # Rollback changes if a transaction is active.
         if use_transactional_fixtures? && Thread.current['open_transactions'] != 0
           ActiveRecord::Base.connection.rollback_db_transaction
@@ -563,28 +964,34 @@ module Test #:nodoc:
         end
         ActiveRecord::Base.verify_active_connections!
       end
-
       alias_method :teardown, :teardown_with_fixtures
 
       def self.method_added(method)
+        return if @__disable_method_added__
+        @__disable_method_added__ = true
+        
         case method.to_s
         when 'setup'
           unless method_defined?(:setup_without_fixtures)
             alias_method :setup_without_fixtures, :setup
-            define_method(:setup) do
+            define_method(:full_setup) do
               setup_with_fixtures
               setup_without_fixtures
             end
           end
+          alias_method :setup, :full_setup
         when 'teardown'
           unless method_defined?(:teardown_without_fixtures)
             alias_method :teardown_without_fixtures, :teardown
-            define_method(:teardown) do
+            define_method(:full_teardown) do
               teardown_without_fixtures
               teardown_with_fixtures
             end
           end
+          alias_method :teardown, :full_teardown
         end
+        
+        @__disable_method_added__ = false
       end
 
       private
@@ -623,6 +1030,5 @@ module Test #:nodoc:
           use_instantiated_fixtures != :no_instances
         end
     end
-
   end
 end