activerecord 1.5.1 → 1.6.0

data/test/base_test.rb

@@ -115,6 +115,19 @@ class BasicsTest < Test::Unit::TestCase
     assert_equal("New Topic", topicReloaded.title)
   end
   
+  def test_create_many
+    topics = Topic.create([ { "title" => "first" }, { "title" => "second" }])
+    assert_equal 2, topics.size
+    assert_equal "first", topics.first.title
+  end
+
+  def test_create_columns_not_equal_attributes
+    topic = Topic.new
+    topic.title = 'Another New Topic'
+    topic.send :write_attribute, 'does_not_exist', 'test'
+    assert_nothing_raised { topic.save }
+  end
+
   def test_create_through_factory
     topic = Topic.create("title" => "New Topic")
     topicReloaded = Topic.find(topic.id)
@@ -140,6 +153,18 @@ class BasicsTest < Test::Unit::TestCase
     assert_equal("Updated topic", topicReloadedAgain.title)
   end
 
+  def test_update_columns_not_equal_attributes
+    topic = Topic.new
+    topic.title = "Still another topic"
+    topic.save
+    id = topic.id
+    
+    topicReloaded = Topic.find(id)
+    topicReloaded.title = "A New Topic"
+    topicReloaded.send :write_attribute, 'does_not_exist', 'test'
+    assert_nothing_raised { topicReloaded.save }
+  end
+
   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
@@ -237,12 +262,22 @@ class BasicsTest < Test::Unit::TestCase
   end
   
   def test_destroy_all
-    assert_equal(2, Topic.find_all.size)
+    assert_equal 2, Topic.find_all.size
 
     Topic.destroy_all "author_name = 'Mary'"
-    assert_equal(1, Topic.find_all.size)
+    assert_equal 1, Topic.find_all.size
   end
-  
+
+  def test_destroy_many
+    Client.destroy([2, 3])
+    assert_equal 0, Client.count
+  end
+
+  def test_delete_many
+    Topic.delete([1, 2])
+    assert_equal 0, Topic.count
+  end
+
   def test_boolean_attributes
     assert ! Topic.find(1).approved?
     assert Topic.find(2).approved?
@@ -268,6 +303,18 @@ class BasicsTest < Test::Unit::TestCase
     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
+    assert_equal 2, Topic.update_all(['content = ?', 'bulk updated again!']);
+    assert_equal "bulk updated again!", Topic.find(1).content
+    assert_equal "bulk updated again!", Topic.find(2).content
+  end
+
+  def test_update_many
+    topic_data = { "1" => { "content" => "1 updated" }, "2" => { "content" => "2 updated" } }
+    updated = Topic.update(topic_data.keys, topic_data.values)
+
+    assert_equal 2, updated.size
+    assert_equal "1 updated", Topic.find(1).content
+    assert_equal "2 updated", Topic.find(2).content
   end
 
   def test_delete_all
@@ -383,6 +430,13 @@ class BasicsTest < Test::Unit::TestCase
     assert_equal 1, firm.rating
   end
   
+  def test_mass_assignment_protection_on_defaults
+    firm = Firm.new
+    firm.attributes = { "id" => 5, "type" => "Client" }
+    assert_nil firm.id
+    assert_equal "Firm", firm[:type]
+  end
+  
   def test_mass_assignment_accessible
     reply = Reply.new("title" => "hello", "content" => "world", "approved" => 0)
     reply.save

data/test/column_alias_test.rb

@@ -0,0 +1,12 @@
+require 'abstract_unit'
+require 'fixtures/topic'
+
+class TestColumnAlias < Test::Unit::TestCase
+
+  def test_column_alias
+    topic = Topic.find(1)
+    records = topic.connection.select_all("SELECT id AS pk FROM topics LIMIT 1")
+    assert_equal(records[0].keys[0], "pk")
+  end
+  
+end

data/test/finder_test.rb

@@ -146,7 +146,15 @@ class FinderTest < Test::Unit::TestCase
     assert_nothing_raised { bind ':a :a', :a => 1 } # ' ruby-mode
     assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode
   end
-	
+
+  def test_bind_array
+    assert_equal '1,2,3', bind('?', [1, 2, 3])
+    assert_equal %('a','b','c'), bind('?', %w(a b c))
+
+    assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
+    assert_equal %('a','b','c'), bind(':a', :a => %w(a b c))
+  end
+
   def test_string_sanitation
     assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
     assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table")
@@ -185,6 +193,29 @@ class FinderTest < Test::Unit::TestCase
 
     assert_equal [], Topic.find_all_by_title("The First Topic!!")
   end
+  
+  def test_find_by_nil_attribute
+    topic = Topic.find_by_last_read nil
+    assert_not_nil topic
+    assert_nil topic.last_read
+  end
+  
+  def test_find_all_by_nil_attribute
+    topics = Topic.find_all_by_last_read nil
+    assert_equal 1, topics.size
+    assert_nil topics[0].last_read
+  end
+  
+  def test_find_by_nil_and_not_nil_attributes
+    topic = Topic.find_by_last_read_and_author_name nil, "Mary"
+    assert_equal "Mary", topic.author_name
+  end
+
+  def test_find_all_by_nil_and_not_nil_attributes
+    topics = Topic.find_all_by_last_read_and_author_name nil, "Mary"
+    assert_equal 1, topics.size
+    assert_equal "Mary", topics[0].author_name
+  end
 
   protected
     def bind(statement, *vars)

data/test/fixtures/company.rb

@@ -12,10 +12,10 @@ class Firm < Company
   has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
   has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
   has_many :clients_using_counter_sql, :class_name => "Client",
-           :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}',
+           :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
            :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = #{id}'
   has_many :clients_using_zero_counter_sql, :class_name => "Client",
-           :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}',
+           :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
            :counter_sql => 'SELECT 0 FROM companies WHERE client_of = #{id}'
 
   has_one :account, :dependent => true

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
-date: 2005-01-18
+  version: 1.6.0
+date: 2005-01-25
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -84,6 +84,7 @@ files:
   - lib/active_record/support/core_ext/hash.rb
   - lib/active_record/support/core_ext/numeric
   - lib/active_record/support/core_ext/numeric.rb
+  - lib/active_record/support/core_ext/object_and_class.rb
   - lib/active_record/support/core_ext/string
   - lib/active_record/support/core_ext/string.rb
   - lib/active_record/support/core_ext/hash/keys.rb
@@ -98,11 +99,13 @@ files:
   - test/abstract_unit.rb
   - test/aggregations_test.rb
   - test/all.sh
+  - test/association_inheritance_reload.rb
   - test/associations_test.rb
   - test/base_test.rb
   - test/binary_test.rb
   - test/callbacks_test.rb
   - test/class_inheritable_attributes_test.rb
+  - test/column_alias_test.rb
   - test/connections
   - test/deprecated_associations_test.rb
   - test/finder_test.rb