activerecord 1.12.2 → 1.13.0

data/lib/active_record/vendor/mysql411.rb

@@ -59,8 +59,8 @@ class Mysql
 
     # Store the version number components for speedy comparison
     version, ostag = @server_version.split( /-/, 2 )
-    @major_ver, @minor_ver, @revision_num = version.split( /\./ ).map { |v| v.to_i }
-    
+    @use_411 = (version.strip >= '4.1.1')
+
     @thread_id, @scramble_buff = a.slice!(0,13).unpack("La8")
     if a.size >= 2 then
       @server_capabilities, = a.slice!(0,2).unpack("v")
@@ -74,7 +74,7 @@ class Mysql
     flag |= @client_flag | CLIENT_CAPABILITIES
     flag |= CLIENT_CONNECT_WITH_DB if db
     
-    if version_meets_minimum?( 4, 1, 1 )
+    if @use_411
       # In 4.1.1+ the seed comes in two parts which must be combined
       a.slice!( 0, 16 )
       seed_part_2 = a.slice!( 0, 12 );      
@@ -116,11 +116,7 @@ class Mysql
     
     [ flag, @max_allowed_packet, @server_language, user, password.size, password, db ].pack( template )
   end
-  
-  def version_meets_minimum?( major, minor, revision )
-    @major_ver >= major && @minor_ver >= minor && @revision_num >= revision
-  end
-  
+
   # SERVER:  public_seed=create_random_string()
   #          send(public_seed)
   #
@@ -161,7 +157,7 @@ class Mysql
   end
   
   def change_user(user="", passwd="", db="")
-    scrambled_password = version_meets_minimum?( 4, 1, 1 ) ? scramble411( passwd, @scramble_buff, @protocol_version==9 ) : scramble( passwd, @scramble_buff, @protocol_version==9 )
+    scrambled_password = @use_411 ? scramble411( passwd, @scramble_buff, @protocol_version==9 ) : scramble( passwd, @scramble_buff, @protocol_version==9 )
     data = user+"\0"+scrambled_password+"\0"+db
     command COM_CHANGE_USER, data
     @user = user
@@ -175,7 +171,7 @@ class Mysql
   alias_method :old_read_one_row, :read_one_row
 
   def read_one_row( field_count )
-    if version_meets_minimum?( 4, 1, 1 )
+    if @use_411
       read_one_row_41( field_count )
     else
       old_read_one_row( field_count )
@@ -203,7 +199,7 @@ class Mysql
   alias_method :old_skip_result, :skip_result
   
   def skip_result
-    if version_meets_minimum?( 4, 1, 1 )
+    if @use_411
       skip_result_41
     else
       old_skip_result
@@ -229,7 +225,7 @@ class Mysql
   alias_method :old_unpack_fields, :unpack_fields
   
   def unpack_fields( data, long_flag_protocol )
-    if version_meets_minimum?( 4, 1, 1 )
+    if @use_411
       unpack_fields_41( data, long_flag_protocol )
     else
       old_unpack_fields( data, long_flag_protocol )
@@ -267,7 +263,7 @@ class Mysql
   alias_method :old_read_query_result, :read_query_result
   
   def read_query_result
-    if version_meets_minimum?( 4, 1, 1 )
+    if @use_411
       read_query_result_41
     else
       old_read_query_result

data/lib/active_record/version.rb

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

data/rakefile

@@ -71,7 +71,7 @@ spec = Gem::Specification.new do |s|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
   
-  s.add_dependency('activesupport', '= 1.2.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.2.3' + PKG_BUILD)
 
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"

data/test/abstract_unit.rb

@@ -17,3 +17,8 @@ class Test::Unit::TestCase #:nodoc:
     Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures/", table_names, &block)
   end
 end
+
+def current_adapter?(type)
+  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
+    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
+end

data/test/ar_schema_test.rb

@@ -18,7 +18,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Schema.define(:version => 7) do
         create_table :fruits do |t|
           t.column :color, :string
-          t.column :size, :string
+          t.column :fruit_size, :string  # NOTE: "size" is reserved in Oracle
           t.column :texture, :string
           t.column :flavor, :string
         end

data/test/associations_extensions_test.rb

@@ -0,0 +1,37 @@
+require 'abstract_unit'
+require 'fixtures/post'
+require 'fixtures/comment'
+require 'fixtures/project'
+require 'fixtures/developer'
+
+class AssociationsExtensionsTest < Test::Unit::TestCase
+  fixtures :projects, :developers, :developers_projects, :comments, :posts
+
+  def test_extension_on_has_many
+    assert_equal comments(:more_greetings), posts(:welcome).comments.find_most_recent
+  end
+  
+  def test_extension_on_habtm
+    assert_equal projects(:action_controller), developers(:david).projects.find_most_recent
+  end
+
+  def test_named_extension_on_habtm
+    assert_equal projects(:action_controller), developers(:david).projects_extended_by_name.find_most_recent
+  end
+  
+  def test_marshalling_extensions
+    david = developers(:david)
+    assert_equal projects(:action_controller), david.projects.find_most_recent
+
+    david = Marshal.load(Marshal.dump(david))
+    assert_equal projects(:action_controller), david.projects.find_most_recent
+  end
+
+  def test_marshalling_named_extensions
+    david = developers(:david)
+    assert_equal projects(:action_controller), david.projects_extended_by_name.find_most_recent
+
+    david = Marshal.load(Marshal.dump(david))
+    assert_equal projects(:action_controller), david.projects_extended_by_name.find_most_recent
+  end
+end

data/test/associations_go_eager_test.rb

@@ -186,4 +186,29 @@ class EagerAssociationTest < Test::Unit::TestCase
     assert_nothing_raised { Post.find(:all, :include => 'comments') }
   end
 
+  def test_preconfigured_includes_with_belongs_to
+    author = posts(:welcome).author_with_posts
+    assert_equal 5, author.posts.size
+  end
+
+  def test_preconfigured_includes_with_has_one
+    comment = posts(:sti_comments).very_special_comment_with_post
+    assert_equal posts(:sti_comments), comment.post
+  end
+
+  def test_preconfigured_includes_with_has_many
+    posts = authors(:david).posts_with_comments
+    assert_equal 2, posts.first.comments.size
+  end
+
+  def test_preconfigured_includes_with_habtm
+    posts = authors(:david).posts_with_categories
+    assert_equal 2, posts.first.categories.size
+  end
+
+  def test_preconfigured_includes_with_has_many_and_habtm
+    posts = authors(:david).posts_with_comments_and_categories
+    assert_equal 2, posts.first.comments.size
+    assert_equal 2, posts.first.categories.size
+  end
 end

data/test/associations_test.rb

@@ -490,6 +490,14 @@ class HasManyAssociationsTest < Test::Unit::TestCase
     assert_equal 3, companies(:first_firm).clients_of_firm(true).size
   end
 
+  def test_find_or_create
+    number_of_clients = companies(:first_firm).clients.size
+    the_client = companies(:first_firm).clients.find_or_create_by_name("Yet another client")
+    assert_equal number_of_clients + 1, companies(:first_firm, :refresh).clients.size
+    assert_equal the_client, companies(:first_firm).clients.find_or_create_by_name("Yet another client")
+    assert_equal number_of_clients + 1, companies(:first_firm, :refresh).clients.size
+  end
+
   def test_deleting
     force_signal37_to_load_all_clients_of_firm
     companies(:first_firm).clients_of_firm.delete(companies(:first_firm).clients_of_firm.first)
@@ -1151,7 +1159,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
     kenReloaded = Developer.find_by_name 'Ken'
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
+    if current_adapter?(:SQLServerAdapter)
       kenReloaded.projects.each { |prj| assert_equal(sqlnow, prj.joined_on.strftime("%Y/%m/%d 00:00:00")) }
     else
       kenReloaded.projects.each { |prj| assert_equal(now.to_s, prj.joined_on.to_s) }
@@ -1245,8 +1253,8 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   def test_additional_columns_from_join_table
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-      assert_equal Time.mktime(2004, 10, 10).strftime("%Y/%m/%d 00:00:00"), Time.parse(Developer.find(1).projects.first.joined_on).strftime("%Y/%m/%d 00:00:00")
+    if current_adapter?(:SQLServerAdapter)
+      assert_equal Time.mktime(2004, 10, 10).strftime("%Y/%m/%d 00:00:00"), Developer.find(1).projects.first.joined_on.strftime("%Y/%m/%d 00:00:00")
     else
       assert_equal Date.new(2004, 10, 10).to_s, Developer.find(1).projects.first.joined_on.to_s
     end
@@ -1266,9 +1274,9 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
     jamis.projects.push_with_attributes(projects(:action_controller), :joined_on => Date.today)
     # SQL Server doesn't have a separate column type just for dates, 
     # so the time is in the string and incorrectly formatted
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter and ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), Time.parse(jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on).strftime("%Y/%m/%d 00:00:00")
-      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), Time.parse(developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on).strftime("%Y/%m/%d 00:00:00")
+    if current_adapter?(:SQLServerAdapter)
+      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.strftime("%Y/%m/%d 00:00:00")
+      assert_equal Time.now.strftime("%Y/%m/%d 00:00:00"), developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.strftime("%Y/%m/%d 00:00:00")
     else
       assert_equal Date.today.to_s, jamis.projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s
       assert_equal Date.today.to_s, developers(:jamis).projects.select { |p| p.name == projects(:action_controller).name }.first.joined_on.to_s

data/test/base_test.rb

@@ -16,6 +16,7 @@ class CreditCard < ActiveRecord::Base; end
 class MasterCreditCard < ActiveRecord::Base; end
 class Post < ActiveRecord::Base; end
 class Computer < ActiveRecord::Base; end
+class NonExistentTable < ActiveRecord::Base; end
 
 class LoosePerson < ActiveRecord::Base
   attr_protected :credit_rating, :administrator
@@ -42,6 +43,11 @@ end
 class BasicsTest < Test::Unit::TestCase
   fixtures :topics, :companies, :developers, :projects, :computers
 
+  def test_table_exists
+    assert !NonExistentTable.table_exists?
+    assert Topic.table_exists?
+  end
+  
   def test_set_attributes
     topic = Topic.find(1)
     topic.attributes = { "title" => "Budget", "author_name" => "Jason" }
@@ -115,7 +121,10 @@ class BasicsTest < Test::Unit::TestCase
     assert_equal(%w( one two three four five ), topic.content)
   end
  
-  def test_attributes_hash
+  def test_case_sensitive_attributes_hash
+    # DB2 is not case-sensitive
+    return true if current_adapter?(:DB2Adapter)
+
     assert_equal @loaded_fixtures['computers']['workstation'].to_hash, Computer.find(:first).attributes
   end
 
@@ -220,26 +229,20 @@ class BasicsTest < Test::Unit::TestCase
 
   def test_preserving_date_objects
     # SQL Server doesn't have a separate column type just for dates, so all are returned as time
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-    end
+    return true if current_adapter?(:SQLServerAdapter)
 
     assert_kind_of(
       Date, Topic.find(1).last_read, 
       "The last_read attribute should be of the Date class"
     )
+  end
 
-    # Oracle does not have a TIME datatype.
-    if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
-    end
+  def test_preserving_time_objects
     assert_kind_of(
       Time, Topic.find(1).bonus_time,
       "The bonus_time attribute should be of the Time class"
     )
-  end
 
-  def test_preserving_time_objects
     assert_kind_of(
       Time, Topic.find(1).written_on,
       "The written_on attribute should be of the Time class"
@@ -384,9 +387,8 @@ class BasicsTest < Test::Unit::TestCase
   
   def test_update_all
     # The ADO library doesn't support the number of affected rows
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-    end
+    return true if current_adapter?(:SQLServerAdapter)
+
     assert_equal 2, Topic.update_all("content = 'bulk updated!'")
     assert_equal "bulk updated!", Topic.find(1).content
     assert_equal "bulk updated!", Topic.find(2).content
@@ -406,9 +408,8 @@ class BasicsTest < Test::Unit::TestCase
 
   def test_delete_all
     # The ADO library doesn't support the number of affected rows
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-    end
+    return true if current_adapter?(:SQLServerAdapter)
+
     assert_equal 2, Topic.delete_all
   end
 
@@ -471,16 +472,16 @@ class BasicsTest < Test::Unit::TestCase
     assert_nil topic.last_read
   end
 
-  # Oracle and SQLServer do not have a TIME datatype.
-  unless 'OCI' == ActiveRecord::Base.connection.adapter_name or ActiveRecord::ConnectionAdapters.const_defined?(:SQLServerAdapter)
-    def test_utc_as_time_zone
-      Topic.default_timezone = :utc
-      attributes = { "bonus_time" => "5:42:00AM" }
-      topic = Topic.find(1)
-      topic.attributes = attributes
-      assert_equal Time.utc(2000, 1, 1, 5, 42, 0), topic.bonus_time
-      Topic.default_timezone = :local
-    end
+  def test_utc_as_time_zone
+    # Oracle and SQLServer do not have a TIME datatype.
+    return true if current_adapter?(:SQLServerAdapter) || current_adapter?(:OCIAdapter)
+
+    Topic.default_timezone = :utc
+    attributes = { "bonus_time" => "5:42:00AM" }
+    topic = Topic.find(1)
+    topic.attributes = attributes
+    assert_equal Time.utc(2000, 1, 1, 5, 42, 0), topic.bonus_time
+    Topic.default_timezone = :local
   end
 
   def test_default_values_on_empty_strings
@@ -587,26 +588,26 @@ class BasicsTest < Test::Unit::TestCase
 
   def test_multiparameter_attributes_on_date
     # SQL Server doesn't have a separate column type just for dates, so all are returned as time
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-    end
+    return true if current_adapter?(:SQLServerAdapter)
 
     attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "6", "last_read(3i)" => "24" }
     topic = Topic.find(1)
     topic.attributes = attributes
-    assert_equal Date.new(2004, 6, 24).to_s, topic.last_read.to_s
+    # note that extra #to_date call allows test to pass for Oracle, which 
+    # treats dates/times the same
+    assert_equal Date.new(2004, 6, 24).to_s, topic.last_read.to_date.to_s
   end
 
   def test_multiparameter_attributes_on_date_with_empty_date
     # SQL Server doesn't have a separate column type just for dates, so all are returned as time
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-    end
+    return true if current_adapter?(:SQLServerAdapter)
 
     attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "6", "last_read(3i)" => "" }
     topic = Topic.find(1)
     topic.attributes = attributes
-    assert_equal Date.new(2004, 6, 1).to_s, topic.last_read.to_s
+    # note that extra #to_date call allows test to pass for Oracle, which 
+    # treats dates/times the same
+    assert_equal Date.new(2004, 6, 1).to_s, topic.last_read.to_date.to_s
   end
 
   def test_multiparameter_attributes_on_date_with_all_empty
@@ -646,14 +647,8 @@ class BasicsTest < Test::Unit::TestCase
   end
 
   def test_attributes_on_dummy_time
-    # Oracle does not have a TIME datatype.
-    if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
-    end
-    # Sqlserver doesn't either .
-    if ActiveRecord::ConnectionAdapters.const_defined? :SQLServerAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::SQLServerAdapter)
-    end
+    # Oracle and SQL Server do not have a TIME datatype.
+    return true if current_adapter?(:SQLServerAdapter) || current_adapter?(:OCIAdapter)
 
     attributes = {
       "bonus_time" => "5:42:00AM"
@@ -734,7 +729,7 @@ class BasicsTest < Test::Unit::TestCase
   end
 
   # TODO: extend defaults tests to other databases!
-  if 'PostgreSQL' == ActiveRecord::Base.connection.adapter_name
+  if current_adapter?(:PostgreSQLAdapter)
     def test_default
       default = Default.new
   
@@ -1035,6 +1030,30 @@ class BasicsTest < Test::Unit::TestCase
     assert_nothing_raised { Category.new.send(:interpolate_sql, 'foo bar} baz') }
   end
 
+  def test_scoped_find_conditions
+    developers = Developer.with_scope(:find => { :conditions => 'salary > 90000' }) do
+      Developer.find(:all, :conditions => 'id < 5')
+    end
+    david = Developer.find(1)
+    assert !developers.include?(david) # David's salary is less than 90,000
+    assert_equal 3, developers.size
+  end
+  
+  def test_scoped_find_limit_offset
+    developers = Developer.with_scope(:find => { :limit => 3, :offset => 2 }) do
+      Developer.find(:all, :order => 'id')
+    end    
+    david = Developer.find(1)
+    jamis = Developer.find(1)
+    assert !developers.include?(david) # David has id 1
+    assert !developers.include?(jamis) # Jamis has id 2
+    assert_equal 3, developers.size
+    
+    # Test without scoped find conditions to ensure we get the whole thing
+    developers = Developer.find(:all, :order => 'id')
+    assert_equal 10, developers.size
+  end
+  
   # FIXME: this test ought to run, but it needs to run sandboxed so that it
   # doesn't b0rk the current test environment by undefing everything.
   #
@@ -1058,9 +1077,8 @@ class BasicsTest < Test::Unit::TestCase
   #end
   
   private
-
     def assert_readers(model, exceptions)
       expected_readers = model.column_names - (model.serialized_attributes.keys + exceptions + ['id'])
-      assert_equal expected_readers.sort, model.read_methods.keys.sort
+      assert_equal expected_readers.sort, model.read_methods.to_a.sort
     end
 end

data/test/connections/native_sqlite/connection.rb

@@ -18,7 +18,7 @@ def make_connection(clazz, db_file, db_definitions_file)
     raise SqliteError.new("Seems that there is no sqlite executable available") unless system(sqlite_command)
     clazz.establish_connection(
         :adapter => "sqlite",
-        :dbfile  => db_file)
+        :database  => db_file)
     script = File.read("#{BASE_DIR}/db_definitions/#{db_definitions_file}")
     # SQLite-Ruby has problems with semi-colon separated commands, so split and execute one at a time
     script.split(';').each do
@@ -28,7 +28,7 @@ def make_connection(clazz, db_file, db_definitions_file)
   else
     clazz.establish_connection(
         :adapter => "sqlite",
-        :dbfile  => db_file)
+        :database  => db_file)
   end
 end