activerecord 1.15.6 → 2.0.0

data/lib/active_record/version.rb

@@ -1,8 +1,8 @@
 module ActiveRecord
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 15
-    TINY  = 6
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/activerecord.rb

@@ -0,0 +1 @@
+require 'active_record'

data/test/aaa_create_tables_test.rb

@@ -9,7 +9,7 @@ class AAACreateTablesTest < Test::Unit::TestCase
   end
 
   def test_drop_and_create_main_tables
-    recreate ActiveRecord::Base
+    recreate ActiveRecord::Base unless use_migrations?
     assert true
   end
 
@@ -23,11 +23,24 @@ class AAACreateTablesTest < Test::Unit::TestCase
   end
   
   def test_drop_and_create_courses_table
-    recreate Course, '2'
+    if Course.connection.supports_migrations?
+      eval(File.read("#{File.dirname(__FILE__)}/fixtures/db_definitions/schema2.rb"))
+    end
+    recreate Course, '2' unless use_migrations_for_courses?
     assert true
   end
 
   private
+    def use_migrations?
+      unittest_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + ".sql"
+      not File.exists? "#{@base_path}/#{unittest_sql_filename}"
+    end
+
+    def use_migrations_for_courses?
+      unittest2_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + "2.sql"
+      not File.exists? "#{@base_path}/#{unittest2_sql_filename}"
+    end
+
     def recreate(base, suffix = nil)
       connection = base.connection
       adapter_name = connection.adapter_name.downcase + suffix.to_s

data/test/abstract_unit.rb

@@ -4,8 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
-require 'active_support/binding_of_caller'
-require 'active_support/breakpoint'
+require 'active_support/test_case'
 require 'connection'
 
 # Show backtraces for deprecated behavior for quicker cleanup.
@@ -36,16 +35,10 @@ class Test::Unit::TestCase #:nodoc:
   end
 
   def assert_queries(num = 1)
-    ActiveRecord::Base.connection.class.class_eval do
-      self.query_count = 0
-      alias_method :execute, :execute_with_query_counting
-    end
+    $query_count = 0
     yield
   ensure
-    ActiveRecord::Base.connection.class.class_eval do
-      alias_method :execute, :execute_without_query_counting
-    end
-    assert_equal num, ActiveRecord::Base.connection.query_count, "#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed."
+    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
   end
 
   def assert_no_queries(&block)
@@ -60,18 +53,32 @@ def current_adapter?(*types)
   end
 end
 
+def uses_mocha(test_name)
+  require 'rubygems'
+  require 'mocha'
+  yield
+rescue LoadError
+  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
+end
+
 ActiveRecord::Base.connection.class.class_eval do
-  cattr_accessor :query_count
+  unless defined? IGNORED_SQL
+    IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]
 
-  # Array of regexes of queries that are not counted against query_count
-  @@ignore_list = [/^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/]
+    def execute_with_counting(sql, name = nil, &block)
+      $query_count ||= 0
+      $query_count  += 1 unless IGNORED_SQL.any? { |r| sql =~ r }
+      execute_without_counting(sql, name, &block)
+    end
 
-  alias_method :execute_without_query_counting, :execute
-  def execute_with_query_counting(sql, name = nil, &block)
-    self.query_count += 1 unless @@ignore_list.any? { |r| sql =~ r }
-    execute_without_query_counting(sql, name, &block)
+    alias_method_chain :execute, :counting
   end
 end
 
+# Make with_scope public for tests
+class << ActiveRecord::Base
+  public :with_scope, :with_exclusive_scope
+end
+
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 #ActiveRecord::Base.colorize_logging = false

data/test/active_schema_test_mysql.rb

@@ -5,27 +5,39 @@ class ActiveSchemaTest < Test::Unit::TestCase
     ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do
       alias_method :real_execute, :execute
       def execute(sql, name = nil) return sql end
-    end    
+    end
   end
-  
+
   def teardown
     ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:alias_method, :execute, :real_execute)
   end
 
   def test_drop_table
-    assert_equal "DROP TABLE people", drop_table(:people)
+    assert_equal "DROP TABLE `people`", drop_table(:people)
   end
-  
+
+  if current_adapter?(:MysqlAdapter)
+    def test_create_mysql_database_with_encoding
+      assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
+      assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
+      assert_equal "CREATE DATABASE `matt_aimonetti` DEFAULT CHARACTER SET `big5` COLLATE `big5_chinese_ci`", create_database(:matt_aimonetti, {:charset => :big5, :collation => :big5_chinese_ci})
+    end
+  end
+
   def test_add_column
-    assert_equal "ALTER TABLE people ADD `last_name` varchar(255)", add_column(:people, :last_name, :string)
+    assert_equal "ALTER TABLE `people` ADD `last_name` varchar(255)", add_column(:people, :last_name, :string)
   end
-  
+
   def test_add_column_with_limit
-    assert_equal "ALTER TABLE people ADD `key` varchar(32)", add_column(:people, :key, :string, :limit => 32)
+    assert_equal "ALTER TABLE `people` ADD `key` varchar(32)", add_column(:people, :key, :string, :limit => 32)
+  end
+
+  def test_drop_table_with_specific_database
+    assert_equal "DROP TABLE `otherdb`.`people`", drop_table('otherdb.people')
   end
   
   private
     def method_missing(method_symbol, *arguments)
       ActiveRecord::Base.connection.send(method_symbol, *arguments)
     end
-end
+end

data/test/adapter_test.rb

@@ -19,7 +19,7 @@ class AdapterTest < Test::Unit::TestCase
 
   def test_indexes
     idx_name = "accounts_idx"
-      
+
     if @connection.respond_to?(:indexes)
       indexes = @connection.indexes("accounts")
       assert indexes.empty?
@@ -39,24 +39,42 @@ class AdapterTest < Test::Unit::TestCase
   ensure
     @connection.remove_index(:accounts, :name => idx_name) rescue nil
   end
-  
+
   def test_current_database
     if @connection.respond_to?(:current_database)
       assert_equal ENV['ARUNIT_DB_NAME'] || "activerecord_unittest", @connection.current_database
     end
   end
 
+  if current_adapter?(:MysqlAdapter)
+    def test_charset
+      assert_not_nil @connection.charset
+      assert_not_equal 'character_set_database', @connection.charset
+      assert_equal @connection.show_variable('character_set_database'), @connection.charset
+    end
+
+    def test_collation
+      assert_not_nil @connection.collation
+      assert_not_equal 'collation_database', @connection.collation
+      assert_equal @connection.show_variable('collation_database'), @connection.collation
+    end
+
+    def test_show_nonexistent_variable_returns_nil
+      assert_nil @connection.show_variable('foo_bar_baz')
+    end
+  end
+
   def test_table_alias
     def @connection.test_table_alias_length() 10; end
     class << @connection
       alias_method :old_table_alias_length, :table_alias_length
       alias_method :table_alias_length,     :test_table_alias_length
     end
-      
+
     assert_equal 'posts',      @connection.table_alias_for('posts')
     assert_equal 'posts_comm', @connection.table_alias_for('posts_comments')
     assert_equal 'dbo_posts',  @connection.table_alias_for('dbo.posts')
-    
+
     class << @connection
       alias_method :table_alias_length, :old_table_alias_length
     end
@@ -66,7 +84,7 @@ class AdapterTest < Test::Unit::TestCase
   if ActiveRecord::Base.connection.respond_to?(:reset_pk_sequence!)
     require 'fixtures/movie'
     require 'fixtures/subscriber'
-    
+
     def test_reset_empty_table_with_custom_pk
       Movie.delete_all
       Movie.connection.reset_pk_sequence! 'movies'

data/test/adapter_test_sqlserver.rb

@@ -4,6 +4,8 @@ require 'fixtures/post'
 require 'fixtures/task'
 
 class SqlServerAdapterTest < Test::Unit::TestCase
+  class TableWithRealColumn < ActiveRecord::Base; end
+
   fixtures :posts, :tasks
 
   def setup
@@ -11,7 +13,11 @@ class SqlServerAdapterTest < Test::Unit::TestCase
   end
 
   def teardown
-    @connection.execute("SET LANGUAGE us_english")
+    @connection.execute("SET LANGUAGE us_english") rescue nil
+  end
+
+  def test_real_column_has_float_type
+    assert_equal :float, TableWithRealColumn.columns_hash["real_number"].type
   end
 
   # SQL Server 2000 has a bug where some unambiguous date formats are not 
@@ -24,6 +30,14 @@ class SqlServerAdapterTest < Test::Unit::TestCase
     end
   end
 
+  def test_indexes_with_descending_order
+    # Make sure we have an index with descending order
+    @connection.execute "CREATE INDEX idx_credit_limit ON accounts (credit_limit DESC)" rescue nil
+    assert_equal ["credit_limit"], @connection.indexes('accounts').first.columns
+  ensure
+    @connection.execute "DROP INDEX accounts.idx_credit_limit"
+  end
+
   def test_execute_without_block_closes_statement
     assert_all_statements_used_are_closed do
       @connection.execute("SELECT 1")

data/test/aggregations_test.rb

@@ -20,7 +20,7 @@ class AggregationsTest < Test::Unit::TestCase
   def test_change_single_value_object
     customers(:david).balance = Money.new(100)
     customers(:david).save
-    assert_equal 100, Customer.find(1).balance.amount
+    assert_equal 100, customers(:david).reload.balance.amount
   end
   
   def test_immutable_value_objects
@@ -92,6 +92,21 @@ class AggregationsTest < Test::Unit::TestCase
   def test_nil_raises_error_when_allow_nil_is_false
     assert_raises(NoMethodError) { customers(:david).balance = nil }
   end
+
+  def test_allow_nil_address_loaded_when_only_some_attributes_are_nil
+    customers(:zaphod).address_street = nil
+    customers(:zaphod).save
+    customers(:zaphod).reload
+    assert_kind_of Address, customers(:zaphod).address
+    assert customers(:zaphod).address.street.nil?
+  end
+
+  def test_nil_assignment_results_in_nil
+    customers(:david).gps_location = GpsLocation.new('39x111')
+    assert_not_equal nil, customers(:david).gps_location
+    customers(:david).gps_location = nil
+    assert_equal nil, customers(:david).gps_location
+  end
 end
 
 class OverridingAggregationsTest < Test::Unit::TestCase

data/test/all.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ -z "$1" ]; then
-	echo "Usage: $0 connections/<db_library>" 1>&2
+	echo "Usage: $0 <database>" 1>&2
 	exit 1
 fi
 
-ruby -I $1 -e 'Dir.foreach(".") { |file| require file if file =~ /_test.rb$/ }'
+ruby -I connections/native_$1 -e 'Dir["**/*_test.rb"].each { |path| require path }'

data/test/associations/callbacks_test.rb

@@ -15,29 +15,29 @@ class AssociationCallbacksTest < Test::Unit::TestCase
     @authorless = posts(:authorless)
     assert @david.post_log.empty?
   end
-  
+
   def test_adding_macro_callbacks
     @david.posts_with_callbacks << @thinking
     assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}"], @david.post_log
     @david.posts_with_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}",
                   "after_adding#{@thinking.id}"], @david.post_log
   end
-  
+
   def test_adding_with_proc_callbacks
     @david.posts_with_proc_callbacks << @thinking
     assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}"], @david.post_log
     @david.posts_with_proc_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "after_adding#{@thinking.id}", "before_adding#{@thinking.id}",
                   "after_adding#{@thinking.id}"], @david.post_log
   end
-  
+
   def test_removing_with_macro_callbacks
     first_post, second_post = @david.posts_with_callbacks[0, 2]
     @david.posts_with_callbacks.delete(first_post)
     assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}"], @david.post_log
     @david.posts_with_callbacks.delete(second_post)
-    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}", 
+    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}",
                   "after_removing#{second_post.id}"], @david.post_log
   end
 
@@ -46,20 +46,43 @@ class AssociationCallbacksTest < Test::Unit::TestCase
     @david.posts_with_proc_callbacks.delete(first_post)
     assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}"], @david.post_log
     @david.posts_with_proc_callbacks.delete(second_post)
-    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}", 
+    assert_equal ["before_removing#{first_post.id}", "after_removing#{first_post.id}", "before_removing#{second_post.id}",
                   "after_removing#{second_post.id}"], @david.post_log
   end
-  
+
   def test_multiple_callbacks
     @david.posts_with_multiple_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}",
                   "after_adding_proc#{@thinking.id}"], @david.post_log
     @david.posts_with_multiple_callbacks << @thinking
-    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}", 
-                  "after_adding_proc#{@thinking.id}", "before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", 
+    assert_equal ["before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}", "after_adding#{@thinking.id}",
+                  "after_adding_proc#{@thinking.id}", "before_adding#{@thinking.id}", "before_adding_proc#{@thinking.id}",
                   "after_adding#{@thinking.id}", "after_adding_proc#{@thinking.id}"], @david.post_log
   end
-  
+
+  def test_has_many_callbacks_with_create
+    morten = Author.create :name => "Morten"
+    post = morten.posts_with_proc_callbacks.create! :title => "Hello", :body => "How are you doing?"
+    assert_equal ["before_adding<new>", "after_adding#{post.id}"], morten.post_log
+  end
+
+  def test_has_many_callbacks_with_create!
+    morten = Author.create! :name => "Morten"
+    post = morten.posts_with_proc_callbacks.create :title => "Hello", :body => "How are you doing?"
+    assert_equal ["before_adding<new>", "after_adding#{post.id}"], morten.post_log
+  end
+
+  def test_has_many_callbacks_for_save_on_parent
+    jack = Author.new :name => "Jack"
+    post = jack.posts_with_callbacks.build :title => "Call me back!", :body => "Before you wake up and after you sleep"
+
+    callback_log = ["before_adding<new>", "after_adding#{jack.posts_with_callbacks.first.id}"]
+    assert_equal callback_log, jack.post_log
+    assert jack.save
+    assert_equal 1, jack.posts_with_callbacks.count
+    assert_equal callback_log, jack.post_log
+  end
+
   def test_has_and_belongs_to_many_add_callback
     david = developers(:david)
     ar = projects(:active_record)
@@ -67,10 +90,10 @@ class AssociationCallbacksTest < Test::Unit::TestCase
     ar.developers_with_callbacks << david
     assert_equal ["before_adding#{david.id}", "after_adding#{david.id}"], ar.developers_log
     ar.developers_with_callbacks << david
-    assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}", 
+    assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}",
                   "after_adding#{david.id}"], ar.developers_log
   end
-  
+
   def test_has_and_belongs_to_many_remove_callback
     david = developers(:david)
     jamis = developers(:jamis)
@@ -78,9 +101,9 @@ class AssociationCallbacksTest < Test::Unit::TestCase
     assert activerecord.developers_log.empty?
     activerecord.developers_with_callbacks.delete(david)
     assert_equal ["before_removing#{david.id}", "after_removing#{david.id}"], activerecord.developers_log
-    
+
     activerecord.developers_with_callbacks.delete(jamis)
-    assert_equal ["before_removing#{david.id}", "after_removing#{david.id}", "before_removing#{jamis.id}", 
+    assert_equal ["before_removing#{david.id}", "after_removing#{david.id}", "before_removing#{jamis.id}",
                   "after_removing#{jamis.id}"], activerecord.developers_log
   end
 
@@ -97,7 +120,18 @@ class AssociationCallbacksTest < Test::Unit::TestCase
     assert activerecord.developers_with_callbacks.clear
     assert_equal log_array, activerecord.developers_log.sort
   end
-  
+
+  def test_has_many_and_belongs_to_many_callbacks_for_save_on_parent
+    project = Project.new :name => "Callbacks"
+    project.developers_with_callbacks.build :name => "Jack", :salary => 95000
+
+    callback_log = ["before_adding<new>", "after_adding<new>"]
+    assert_equal callback_log, project.developers_log
+    assert project.save
+    assert_equal 1, project.developers_with_callbacks.count
+    assert_equal callback_log, project.developers_log
+  end
+
   def test_dont_add_if_before_callback_raises_exception
     assert !@david.unchangable_posts.include?(@authorless)
     begin
@@ -109,18 +143,5 @@ class AssociationCallbacksTest < Test::Unit::TestCase
     @david.reload
     assert !@david.unchangable_posts.include?(@authorless)
   end
-  
-  def test_push_with_attributes
-    assert_deprecated 'push_with_attributes' do
-      david = developers(:david)
-      activerecord = projects(:active_record)
-      assert activerecord.developers_log.empty?
-      activerecord.developers_with_callbacks.push_with_attributes(david, {})
-      assert_equal ["before_adding#{david.id}", "after_adding#{david.id}"], activerecord.developers_log
-      activerecord.developers_with_callbacks.push_with_attributes(david, {})
-      assert_equal ["before_adding#{david.id}", "after_adding#{david.id}", "before_adding#{david.id}", 
-                    "after_adding#{david.id}"], activerecord.developers_log
-    end
-  end
 end