activerecord 1.11.1 → 1.12.1

data/test/reflection_test.rb

@@ -28,7 +28,10 @@ class ReflectionTest < Test::Unit::TestCase
   end
 
   def test_content_columns
-    assert_equal 8, Topic.content_columns.length
+    content_columns        = Topic.content_columns
+    content_column_names   = content_columns.map {|column| column.name}
+    assert_equal 8, content_columns.length
+    assert_equal %w(title author_name author_email_address written_on bonus_time last_read content approved).sort, content_column_names.sort
   end
 
   def test_column_string_type_and_limit

data/test/schema_dumper_test.rb

@@ -0,0 +1,19 @@
+require 'abstract_unit'
+require "#{File.dirname(__FILE__)}/../lib/active_record/schema_dumper"
+require 'stringio'
+
+if ActiveRecord::Base.connection.respond_to?(:tables)
+
+  class SchemaDumperTest < Test::Unit::TestCase
+    def test_schema_dump
+      stream = StringIO.new
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+      output = stream.string
+
+      assert_match %r{create_table "accounts"}, output
+      assert_match %r{create_table "authors"}, output
+      assert_no_match %r{create_table "schema_info"}, output
+    end
+  end
+
+end

data/test/schema_test_postgresql.rb

@@ -1,6 +1,8 @@
 require 'abstract_unit'
 
 class SchemaTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
+
   SCHEMA_NAME = 'test_schema'
   TABLE_NAME = 'things'
   COLUMNS = [
@@ -15,8 +17,7 @@ class SchemaTest < Test::Unit::TestCase
   end
 
   def teardown
-    @connection.execute "DROP TABLE #{SCHEMA_NAME}.#{TABLE_NAME}"
-    @connection.execute "DROP SCHEMA #{SCHEMA_NAME}"
+    @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
 
   def test_with_schema_prefixed_table_name

data/test/synonym_test_oci.rb

@@ -0,0 +1,17 @@
+require 'abstract_unit'
+require 'fixtures/topic'
+require 'fixtures/subject'
+
+# confirm that synonyms work just like tables; in this case
+# the "subjects" table in Oracle (defined in oci.sql) is just
+# a synonym to the "topics" table
+
+class TestOracleSynonym < Test::Unit::TestCase
+
+  def test_oracle_synonym
+    topic = Topic.new
+	subject = Subject.new
+    assert_equal(topic.attributes, subject.attributes)
+  end
+  
+end

data/test/threaded_connections_test.rb

@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'fixtures/topic'
 
 class ThreadedConnectionsTest < Test::Unit::TestCase
   self.use_transactional_fixtures = false
@@ -11,7 +12,7 @@ class ThreadedConnectionsTest < Test::Unit::TestCase
   end
   
   def gather_connections(use_threaded_connections)
-    ActiveRecord::Base.threaded_connections = use_threaded_connections
+    ActiveRecord::Base.allow_concurrency = use_threaded_connections
     ActiveRecord::Base.establish_connection(@connection)
     
     5.times do

data/test/transactions_test.rb

@@ -1,11 +1,11 @@
 require 'abstract_unit'
 require 'fixtures/topic'
-
+require 'fixtures/developer'
 
 class TransactionTest < Test::Unit::TestCase
   self.use_transactional_fixtures = false
 
-  fixtures :topics
+  fixtures :topics, :developers
 
   def setup
     # sqlite does not seem to return these in the right order, so we sort them
@@ -15,20 +15,51 @@ class TransactionTest < Test::Unit::TestCase
 
   def test_successful
     Topic.transaction do
-      @first.approved  = 1
-      @second.approved = 0
+      @first.approved  = true
+      @second.approved = false
+      @first.save
+      @second.save
+    end
+
+    assert Topic.find(1).approved?, "First should have been approved"
+    assert !Topic.find(2).approved?, "Second should have been unapproved"
+  end
+
+  def transaction_with_return
+    Topic.transaction do
+      @first.approved  = true
+      @second.approved = false
       @first.save
       @second.save
+      return
     end
+  end
+
+  def test_successful_with_return
+    class << Topic.connection
+      alias :real_commit_db_transaction :commit_db_transaction
+      def commit_db_transaction
+        $committed = true
+        real_commit_db_transaction
+      end
+    end
+
+    $committed = false
+    transaction_with_return
+    assert $committed
 
     assert Topic.find(1).approved?, "First should have been approved"
     assert !Topic.find(2).approved?, "Second should have been unapproved"
+  ensure
+    class << Topic.connection
+      alias :commit_db_transaction :real_commit_db_transaction rescue nil
+    end
   end
 
   def test_successful_with_instance_method
     @first.transaction do
-      @first.approved  = 1
-      @second.approved = 0
+      @first.approved  = true
+      @second.approved = false
       @first.save
       @second.save
     end
@@ -36,7 +67,7 @@ class TransactionTest < Test::Unit::TestCase
     assert Topic.find(1).approved?, "First should have been approved"
     assert !Topic.find(2).approved?, "Second should have been unapproved"
   end
- 
+
   def test_failing_on_exception
     begin
       Topic.transaction do
@@ -94,8 +125,8 @@ class TransactionTest < Test::Unit::TestCase
   def test_nested_explicit_transactions
     Topic.transaction do
       Topic.transaction do
-        @first.approved  = 1
-        @second.approved = 0
+        @first.approved  = true
+        @second.approved = false
         @first.save
         @second.save
       end
@@ -104,7 +135,75 @@ class TransactionTest < Test::Unit::TestCase
     assert Topic.find(1).approved?, "First should have been approved"
     assert !Topic.find(2).approved?, "Second should have been unapproved"
   end
-    
+
+  # This will cause transactions to overlap and fail unless they are
+  # performed on separate database connections.
+  def test_transaction_per_thread
+    assert_nothing_raised do
+      threads = (1..20).map do
+        Thread.new do
+          Topic.transaction do
+            topic = Topic.find(:first)
+            topic.approved = !topic.approved?
+            topic.save!
+            topic.approved = !topic.approved?
+            topic.save!
+          end
+        end
+      end
+
+      threads.each { |t| t.join }
+    end
+  end
+
+  # Test for dirty reads among simultaneous transactions.
+  def test_transaction_isolation__read_committed
+    # Should be invariant.
+    original_salary = Developer.find(1).salary
+    temporary_salary = 200000
+
+    assert_nothing_raised do
+      threads = (1..20).map do
+        Thread.new do
+          Developer.transaction do
+            # Expect original salary.
+            dev = Developer.find(1)
+            assert_equal original_salary, dev.salary
+
+            dev.salary = temporary_salary
+            dev.save!
+
+            # Expect temporary salary.
+            dev = Developer.find(1)
+            assert_equal temporary_salary, dev.salary
+
+            dev.salary = original_salary
+            dev.save!
+
+            # Expect original salary.
+            dev = Developer.find(1)
+            assert_equal original_salary, dev.salary
+          end
+        end
+      end
+
+      # Keep our eyes peeled.
+      threads << Thread.new do
+        10.times do
+          sleep 0.05
+          Developer.transaction do
+            # Always expect original salary.
+            assert_equal original_salary, Developer.find(1).salary
+          end
+        end
+      end
+
+      threads.each { |t| t.join }
+    end
+
+    assert_equal original_salary, Developer.find(1).salary
+  end
+
 
   private
     def add_exception_raising_after_save_callback_to_topic

data/test/validations_test.rb

@@ -396,15 +396,20 @@ class ValidationsTest < Test::Unit::TestCase
   def test_validates_length_of_using_within
     Topic.validates_length_of(:title, :content, :within => 3..5)
 
-    t = Topic.create("title" => "a!", "content" => "I'm ooooooooh so very long")
-    assert !t.save
-
+    t = Topic.new("title" => "a!", "content" => "I'm ooooooooh so very long")
+    assert !t.valid?
     assert_equal "is too short (min is 3 characters)", t.errors.on(:title)
     assert_equal "is too long (max is 5 characters)", t.errors.on(:content)
 
+    t.title = nil
+    t.content = nil
+    assert !t.valid?
+    assert_equal "is too short (min is 3 characters)", t.errors.on(:title)
+    assert_equal "is too short (min is 3 characters)", t.errors.on(:content)
+
     t.title = "abe"
     t.content  = "mad"
-    assert t.save
+    assert t.valid?
   end
 
   def test_optionally_validates_length_of_using_within
@@ -702,43 +707,6 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal r.errors.on(:topic).first, "This string contains 'single' and \"double\" quotes"
   end
 
-  def test_validates_numericality_of_with_string
-    Topic.validates_numericality_of( :approved )
-    ["not a number","42 not a number","0xdeadbeef","00-1","-+019.0","12.12.13.12",nil].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => "not a number")
-        assert !t.valid?, "#{v} not rejected as a number"
-        assert t.errors.on(:approved)
-    end
-  end
-
-  def test_validates_numericality_of
-    Topic.validates_numericality_of( :approved, :allow_nil => true )
-    ["10", "10.0", "10.5", "-10.5", "-0.0001","0090","-090","-090.1",nil,""].each do |v|
-        t = Topic.new("title" => "numeric test", "content" => "whatever", "approved" => v)
-        assert t.valid?, "#{v} not recognized as a number"
-        # we cannot check this as approved is actually an integer field
-        #assert_in_delta v.to_f, t.approved, 0.0000001
-    end
-  end
-
-  def test_validates_numericality_of_int_with_string
-    Topic.validates_numericality_of( :approved, :only_integer => true )
-    ["not a number","42 not a number","0xdeadbeef","0-1","--3","+-3","+3-1",nil].each do |v|
-        t = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => v)
-        assert !t.valid?, "#{v} not rejected as integer"
-        assert t.errors.on(:approved)
-    end
-  end
-
-  def test_validates_numericality_of_int
-    Topic.validates_numericality_of( :approved, :only_integer => true, :allow_nil => true )
-    ["42", "+42", "-42", "042", "0042", "-042", 42, nil,""].each do |v|
-        t = Topic.new("title" => "numeric test", "content" => "whatever", "approved" => v)
-        assert t.valid?, "#{v} not recognized as integer"
-        assert_equal((v.nil? or v == "")? nil : v.to_i, t.approved)
-    end
-  end
-
   def test_conditional_validation_using_method_true
     # When the method returns true
     Topic.validates_length_of( :title, :maximum=>5, :too_long=>"hoo %d", :if => :condition_is_true )
@@ -801,4 +769,64 @@ class ValidationsTest < Test::Unit::TestCase
     r.topic = Topic.find :first
     assert r.valid?
   end
-end
+end
+
+
+class ValidatesNumericalityTest
+  NIL = [nil, "", " ", " \t \r \n"]
+  FLOAT_STRINGS = %w(0.0 +0.0 -0.0 10.0 10.5 -10.5 -0.0001 -090.1)
+  INTEGER_STRINGS = %w(0 +0 -0 10 +10 -10 0090 -090)
+  FLOATS = [0.0, 10.0, 10.5, -10.5, -0.0001] + FLOAT_STRINGS
+  INTEGERS = [0, 10, -10] + INTEGER_STRINGS
+  JUNK = ["not a number", "42 not a number", "0xdeadbeef", "00-1", "--3", "+-3", "+3-1", "-+019.0", "12.12.13.12"]
+
+  def setup
+    Topic.write_inheritable_attribute(:validate, nil)
+    Topic.write_inheritable_attribute(:validate_on_create, nil)
+    Topic.write_inheritable_attribute(:validate_on_update, nil)
+  end
+
+  def test_default_validates_numericality_of
+    Topic.validates_numericality_of :approved
+
+    invalid!(NIL + JUNK)
+    valid!(FLOATS + INTEGERS)
+  end
+
+  def test_validates_numericality_of_with_nil_allowed
+    Topic.validates_numericality_of :approved, :allow_nil => true
+
+    invalid!(JUNK)
+    valid!(NIL + FLOATS + INTEGERS)
+  end
+
+  def test_validates_numericality_of_with_integer_only
+    Topic.validates_numericality_of :approved, :only_integer => true
+
+    invalid!(NIL + JUNK + FLOATS)
+    valid!(INTEGERS)
+  end
+
+  def test_validates_numericality_of_with_integer_only_and_nil_allowed
+    Topic.validates_numericality_of :approved, :only_integer => true, :allow_nil => true
+
+    invalid!(JUNK + FLOATS)
+    valid!(NIL + INTEGERS)
+  end
+
+  private
+    def invalid!(values)
+      values.each do |value|
+        topic = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => value)
+        assert !topic.valid?, "#{value} not rejected as a number"
+        assert topic.errors.on(:approved)
+      end
+    end
+
+    def valid!(values)
+      values.each do |value|
+        topic = Topic.create("title" => "numeric test", "content" => "whatever", "approved" => value)
+        assert topic.valid?, "#{value} not accepted as a number"
+      end
+    end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.11.1
-date: 2005-07-11
+  version: 1.12.1
+date: 2005-10-19
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
   - lib
@@ -51,10 +51,13 @@ files:
   - lib/active_record/observer.rb
   - lib/active_record/query_cache.rb
   - lib/active_record/reflection.rb
+  - lib/active_record/schema.rb
+  - lib/active_record/schema_dumper.rb
   - lib/active_record/timestamp.rb
   - lib/active_record/transactions.rb
   - lib/active_record/validations.rb
   - lib/active_record/vendor
+  - lib/active_record/version.rb
   - lib/active_record/wrappers
   - lib/active_record/wrappings.rb
   - lib/active_record/acts/list.rb
@@ -66,6 +69,7 @@ files:
   - lib/active_record/associations/has_and_belongs_to_many_association.rb
   - lib/active_record/associations/has_many_association.rb
   - lib/active_record/associations/has_one_association.rb
+  - lib/active_record/connection_adapters/abstract
   - lib/active_record/connection_adapters/abstract_adapter.rb
   - lib/active_record/connection_adapters/db2_adapter.rb
   - lib/active_record/connection_adapters/mysql_adapter.rb
@@ -73,6 +77,11 @@ files:
   - lib/active_record/connection_adapters/postgresql_adapter.rb
   - lib/active_record/connection_adapters/sqlite_adapter.rb
   - lib/active_record/connection_adapters/sqlserver_adapter.rb
+  - lib/active_record/connection_adapters/abstract/connection_specification.rb
+  - lib/active_record/connection_adapters/abstract/database_statements.rb
+  - lib/active_record/connection_adapters/abstract/quoting.rb
+  - lib/active_record/connection_adapters/abstract/schema_definitions.rb
+  - lib/active_record/connection_adapters/abstract/schema_statements.rb
   - lib/active_record/vendor/db2.rb
   - lib/active_record/vendor/mysql.rb
   - lib/active_record/vendor/mysql411.rb
@@ -81,8 +90,10 @@ files:
   - test/aaa_create_tables_test.rb
   - test/abstract_unit.rb
   - test/active_schema_mysql.rb
+  - test/adapter_test.rb
   - test/aggregations_test.rb
   - test/all.sh
+  - test/ar_schema_test.rb
   - test/association_callbacks_test.rb
   - test/association_inheritance_reload.rb
   - test/associations_go_eager_test.rb
@@ -92,7 +103,9 @@ files:
   - test/callbacks_test.rb
   - test/class_inheritable_attributes_test.rb
   - test/column_alias_test.rb
+  - test/conditions_scoping_test.rb
   - test/connections
+  - test/copy_table_sqlite.rb
   - test/deprecated_associations_test.rb
   - test/deprecated_finder_test.rb
   - test/finder_test.rb
@@ -107,9 +120,11 @@ files:
   - test/modules_test.rb
   - test/multiple_db_test.rb
   - test/pk_test.rb
+  - test/readonly_test.rb
   - test/reflection_test.rb
+  - test/schema_dumper_test.rb
   - test/schema_test_postgresql.rb
-  - test/thread_safety_test.rb
+  - test/synonym_test_oci.rb
   - test/threaded_connections_test.rb
   - test/transactions_test.rb
   - test/unconnected_test.rb
@@ -128,16 +143,17 @@ files:
   - test/connections/native_postgresql/connection.rb
   - test/connections/native_sqlite/connection.rb
   - test/connections/native_sqlite3/connection.rb
+  - test/connections/native_sqlite3/in_memory_connection.rb
   - test/connections/native_sqlserver/connection.rb
   - test/connections/native_sqlserver_odbc/connection.rb
   - test/fixtures/accounts.yml
-  - test/fixtures/associations.png
   - test/fixtures/author.rb
   - test/fixtures/authors.yml
   - test/fixtures/auto_id.rb
   - test/fixtures/bad_fixtures
   - test/fixtures/binary.rb
   - test/fixtures/categories.yml
+  - test/fixtures/categories_ordered.yml
   - test/fixtures/categories_posts.yml
   - test/fixtures/category.rb
   - test/fixtures/column_name.rb
@@ -162,12 +178,15 @@ files:
   - test/fixtures/entrants.yml
   - test/fixtures/fk_test_has_fk.yml
   - test/fixtures/fk_test_has_pk.yml
+  - test/fixtures/flowers.jpg
+  - test/fixtures/keyboard.rb
   - test/fixtures/migrations
   - test/fixtures/mixin.rb
   - test/fixtures/mixins.yml
   - test/fixtures/movie.rb
   - test/fixtures/movies.yml
   - test/fixtures/naked
+  - test/fixtures/order.rb
   - test/fixtures/people.yml
   - test/fixtures/person.rb
   - test/fixtures/post.rb
@@ -175,6 +194,7 @@ files:
   - test/fixtures/project.rb
   - test/fixtures/projects.yml
   - test/fixtures/reply.rb
+  - test/fixtures/subject.rb
   - test/fixtures/subscriber.rb
   - test/fixtures/subscribers
   - test/fixtures/task.rb
@@ -248,5 +268,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
+            version: 1.2.1
       version: