activerecord 1.6.0 → 1.7.0

data/lib/active_record/wrappings.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   # A plugin framework for wrapping attribute values before they go in and unwrapping them after they go out of the database.
   # This was intended primarily for YAML wrapping of arrays and hashes, but this behavior is now native in the Base class.
-  # So for now this framework is laying dorment until a need pops up.
+  # So for now this framework is laying dormant until a need pops up.
   module Wrappings #:nodoc:
     module ClassMethods #:nodoc:
       def wrap_with(wrapper, *attributes)
@@ -56,4 +56,4 @@ module ActiveRecord
       def unwrap(attribute) end
     end
   end
-end
+end

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activerecord'
-PKG_VERSION   = '1.6.0' + PKG_BUILD
+PKG_VERSION   = '1.7.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[
@@ -63,6 +63,18 @@ Rake::TestTask.new("test_db2") { |t|
   t.verbose = true
 }
 
+Rake::TestTask.new("test_oracle") { |t|
+  t.libs << "test" << "test/connections/native_oracle"
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+}
+
+Rake::TestTask.new("test_oci") { |t|
+  t.libs << "test" << "test/connections/native_oci"
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+}
+
 # Generate the RDoc documentation
 
 Rake::RDocTask.new { |rdoc|
@@ -104,6 +116,9 @@ spec = Gem::Specification.new do |s|
   dist_dirs.each do |dir|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
+  
+  s.add_dependency('activesupport', '= 1.0.0' + PKG_BUILD)
+
   s.files.delete "test/fixtures/fixture_database.sqlite"
   s.files.delete "test/fixtures/fixture_database_2.sqlite"
   s.files.delete "test/fixtures/fixture_database.sqlite3"
@@ -117,7 +132,7 @@ spec = Gem::Specification.new do |s|
   
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
-  s.homepage = "http://www.rubyonrails.com"
+  s.homepage = "http://www.rubyonrails.org"
   s.rubyforge_project = "activerecord"
 end
   

data/test/aaa_create_tables_test.rb

@@ -0,0 +1,58 @@
+require 'abstract_unit'
+
+# The filename for this test begins with "aaa" so that
+# it will be the first test.
+
+class SqlFile < File
+  #Define an iterator that iterates over the statements in a .sql file.
+  #statements are separated by a semicolon.
+  def initialize(path)
+    super(path)
+  end
+  
+  def each_statement()
+    statement = ''
+    each_line { |line|
+      #The last character of each line is a line-feed, so we will check the next-to-last character
+      #to see if it is a semicolon.  A better way of doing this would be to look for a semicolon anywhere
+      #within the line in case multiple statements have been put on a single line.
+      #The last statement in the file must be followed by a line-feed.
+      if line.slice(-2,1)==';' then
+        statement = statement + line.slice(0,line.length-2) + "\n"
+        yield statement
+        statement = ''
+      else
+        statement = statement + line
+      end
+    }
+  end
+end
+
+class CreateTablesTest < Test::Unit::TestCase
+  def setup
+    # This method is required by rake.
+  end
+
+  def run_sql_file(connection, path)
+    sql_file = SqlFile.new(path)
+    sql_file.each_statement { |statement|
+    begin
+      #Skip errors.  If there is a problem creating the tables then it will show up in other tests.
+      connection.execute(statement)
+    rescue ActiveRecord::StatementInvalid
+    end }
+  end
+
+  def test_table_creation
+    adapter_name = ActiveRecord::Base.connection.adapter_name.downcase
+    run_sql_file ActiveRecord::Base.connection, "test/fixtures/db_definitions/" + adapter_name + ".drop.sql"
+    run_sql_file ActiveRecord::Base.connection, "test/fixtures/db_definitions/" + adapter_name + ".sql"
+
+    # Now do the same thing with the connection used by multiple_db_test.rb
+    adapter_name = Course.retrieve_connection.adapter_name.downcase
+    run_sql_file Course.retrieve_connection, "test/fixtures/db_definitions/" + adapter_name + "2.drop.sql"
+    run_sql_file Course.retrieve_connection, "test/fixtures/db_definitions/" + adapter_name + "2.sql"
+    
+    assert_equal 1,1
+  end
+end

data/test/abstract_unit.rb

@@ -1,10 +1,11 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
 
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
-require 'active_record/support/binding_of_caller'
-require 'active_record/support/breakpoint'
+require 'active_support/binding_of_caller'
+require 'active_support/breakpoint'
 require 'connection'
 
 class Test::Unit::TestCase #:nodoc:

data/test/aggregations_test.rb

@@ -1,5 +1,4 @@
 require 'abstract_unit'
-# require File.dirname(__FILE__) + '/../dev-utils/eval_debugger'
 require 'fixtures/customer'
 
 class AggregationsTest < Test::Unit::TestCase

data/test/associations_test.rb

@@ -1,7 +1,6 @@
 require 'abstract_unit'
 require 'fixtures/developer'
 require 'fixtures/project'
-# require File.dirname(__FILE__) + '/../dev-utils/eval_debugger'
 require 'fixtures/company'
 require 'fixtures/topic'
 require 'fixtures/reply'
@@ -462,13 +461,13 @@ class HasManyAssociationsTest < Test::Unit::TestCase
 
   def test_deleting_type_mismatch
     david = Developer.find(1)
-    david.projects.id
+    david.projects.reload
     assert_raises(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(1) }
   end
 
   def test_deleting_self_type_mismatch
     david = Developer.find(1)
-    david.projects.id
+    david.projects.reload
     assert_raises(ActiveRecord::AssociationTypeMismatch) { david.projects.delete(Project.find(1).developers) }
   end
 
@@ -672,7 +671,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   
   def test_adding_single
     jamis = Developer.find(2)
-    jamis.projects.id # causing the collection to load 
+    jamis.projects.reload # causing the collection to load 
     action_controller = Project.find(2)
     assert_equal 1, jamis.projects.size
     assert_equal 1, action_controller.developers.size    
@@ -693,7 +692,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   def test_adding_from_the_project
     jamis = Developer.find(2)
     action_controller = Project.find(2)
-    action_controller.developers.id
+    action_controller.developers.reload
     assert_equal 1, jamis.projects.size
     assert_equal 1, action_controller.developers.size
 
@@ -705,36 +704,36 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   end
 
   def test_adding_multiple
-    aridridel = Developer.new("name" => "Aridridel")
-    aridridel.save
-    aridridel.projects.id
-    aridridel.projects.push(Project.find(1), Project.find(2))
-    assert_equal 2, aridridel.projects.size
-    assert_equal 2, aridridel.projects(true).size
+    aredridel = Developer.new("name" => "Aridridel")
+    aredridel.save
+    aredridel.projects.reload
+    aredridel.projects.push(Project.find(1), Project.find(2))
+    assert_equal 2, aredridel.projects.size
+    assert_equal 2, aredridel.projects(true).size
   end
 
   def test_adding_a_collection
-    aridridel = Developer.new("name" => "Aridridel")
-    aridridel.save
-    aridridel.projects.id
-    aridridel.projects.concat([Project.find(1), Project.find(2)])
-    assert_equal 2, aridridel.projects.size
-    assert_equal 2, aridridel.projects(true).size
+    aredridel = Developer.new("name" => "Aridridel")
+    aredridel.save
+    aredridel.projects.reload
+    aredridel.projects.concat([Project.find(1), Project.find(2)])
+    assert_equal 2, aredridel.projects.size
+    assert_equal 2, aredridel.projects(true).size
   end
 
   def test_habtm_adding_before_save
     no_of_devels = Developer.count
     no_of_projects = Project.count
-    aridridel = Developer.new("name" => "Aridridel")
-    aridridel.projects.concat([Project.find(1), p = Project.new("name" => "Projekt")])
-    assert aridridel.new_record?
+    aredridel = Developer.new("name" => "Aridridel")
+    aredridel.projects.concat([Project.find(1), p = Project.new("name" => "Projekt")])
+    assert aredridel.new_record?
     assert p.new_record?
-    assert aridridel.save
-    assert !aridridel.new_record?
+    assert aredridel.save
+    assert !aredridel.new_record?
     assert_equal no_of_devels+1, Developer.count
     assert_equal no_of_projects+1, Project.count
-    assert_equal 2, aridridel.projects.size
-    assert_equal 2, aridridel.projects(true).size
+    assert_equal 2, aredridel.projects.size
+    assert_equal 2, aredridel.projects(true).size
   end
 
   def test_habtm_adding_before_save_with_join_attributes
@@ -791,7 +790,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   def test_deleting
     david = Developer.find(1)
     active_record = Project.find(1)
-    david.projects.id
+    david.projects.reload
     assert_equal 2, david.projects.size
     assert_equal 2, active_record.developers.size
 
@@ -804,7 +803,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
 
   def test_deleting_array
     david = Developer.find(1)
-    david.projects.id
+    david.projects.reload
     david.projects.delete(Project.find_all)
     assert_equal 0, david.projects.size
     assert_equal 0, david.projects(true).size
@@ -812,7 +811,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
 
   def test_deleting_all
     david = Developer.find(1)
-    david.projects.id
+    david.projects.reload
     david.projects.clear
     assert_equal 0, david.projects.size
     assert_equal 0, david.projects(true).size
@@ -829,7 +828,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
   
   def test_destroy_all
     david = Developer.find(1)
-    david.projects.id
+    david.projects.reload
     assert !david.projects.empty?
     david.projects.destroy_all
     assert david.projects.empty?

data/test/base_test.rb

@@ -176,6 +176,10 @@ class BasicsTest < Test::Unit::TestCase
       "The last_read attribute should be of the Date class"
     )
 
+    # 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
     assert_kind_of(
       Time, Topic.find(1).bonus_time,
       "The bonus_time attribute should be of the Time class"
@@ -201,7 +205,7 @@ class BasicsTest < Test::Unit::TestCase
   end
   
   def test_record_not_found_exception
-    assert_raises(ActiveRecord::RecordNotFound) { topicReloaded = Topic.find(id) }
+    assert_raises(ActiveRecord::RecordNotFound) { topicReloaded = Topic.find(99999) }
   end
   
   def test_initialize_with_attributes
@@ -381,6 +385,11 @@ class BasicsTest < Test::Unit::TestCase
   end
 
   def test_utc_as_time_zone
+    # 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
+
     Topic.default_timezone = :utc
     attributes = { "bonus_time" => "5:42:00AM" }
     topic = Topic.find(1)
@@ -506,6 +515,11 @@ 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
+
     attributes = {
       "bonus_time" => "5:42:00AM"
     }
@@ -543,6 +557,10 @@ class BasicsTest < Test::Unit::TestCase
     cloned_topic = topic.clone
     cloned_topic.title["a"] = "c" 
     assert_equal "b", topic.title["a"]
+
+    cloned_topic.save
+    assert !cloned_topic.new_record?
+    assert cloned_topic.id != topic.id
   end
   
   def test_bignum
@@ -557,7 +575,7 @@ class BasicsTest < Test::Unit::TestCase
     if Default.connection.class.name == 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
       default = Default.new
   
-      # dates / timestampts
+      # dates / timestamps
       time_format = "%m/%d/%Y %H:%M"
       assert_equal Time.now.strftime(time_format), default.modified_time.strftime(time_format)
       assert_equal Date.today, default.modified_date
@@ -688,4 +706,58 @@ class BasicsTest < Test::Unit::TestCase
     t2.reload
     assert_equal t1.title, t2.title
   end
+
+  def test_define_attr_method_with_value
+    k = Class.new( ActiveRecord::Base )
+    k.send(:define_attr_method, :table_name, "foo")
+    assert_equal "foo", k.table_name
+  end
+
+  def test_define_attr_method_with_block
+    k = Class.new( ActiveRecord::Base )
+    k.send(:define_attr_method, :primary_key) { "sys_" + original_primary_key }
+    assert_equal "sys_id", k.primary_key
+  end
+
+  def test_set_table_name_with_value
+    k = Class.new( ActiveRecord::Base )
+    k.table_name = "foo"
+    assert_equal "foo", k.table_name
+    k.set_table_name "bar"
+    assert_equal "bar", k.table_name
+  end
+
+  def test_set_table_name_with_block
+    k = Class.new( ActiveRecord::Base )
+    k.set_table_name { "ks" }
+    assert_equal "ks", k.table_name
+  end
+
+  def test_set_primary_key_with_value
+    k = Class.new( ActiveRecord::Base )
+    k.primary_key = "foo"
+    assert_equal "foo", k.primary_key
+    k.set_primary_key "bar"
+    assert_equal "bar", k.primary_key
+  end
+
+  def test_set_primary_key_with_block
+    k = Class.new( ActiveRecord::Base )
+    k.set_primary_key { "sys_" + original_primary_key }
+    assert_equal "sys_id", k.primary_key
+  end
+
+  def test_set_inheritance_column_with_value
+    k = Class.new( ActiveRecord::Base )
+    k.inheritance_column = "foo"
+    assert_equal "foo", k.inheritance_column
+    k.set_inheritance_column "bar"
+    assert_equal "bar", k.inheritance_column
+  end
+
+  def test_set_inheritance_column_with_block
+    k = Class.new( ActiveRecord::Base )
+    k.set_inheritance_column { original_inheritance_column + "_id" }
+    assert_equal "type_id", k.inheritance_column
+  end
 end

data/test/binary_test.rb

@@ -13,6 +13,10 @@ class BinaryTest < Test::Unit::TestCase
     if ActiveRecord::ConnectionAdapters.const_defined? :DB2Adapter
       return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::DB2Adapter)
     end
+
+    if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
+      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
+    end
     bin = Binary.new
     bin.data = @data
 
@@ -27,10 +31,10 @@ class BinaryTest < Test::Unit::TestCase
     db_bin = Binary.find(bin.id)
 
     assert db_bin.data == bin.data,
-      "Loaded binary data differes from memory version"
+      "Loaded binary data differs from memory version"
     
     assert db_bin.data == File.new(File.dirname(__FILE__)+"/fixtures/associations.png","rb").read, 
-      "Loaded binary data differes from file version"
+      "Loaded binary data differs from file version"
   end
   
   private

data/test/class_inheritable_attributes_test.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'test/unit'
-require 'active_record/support/class_inheritable_attributes'
+require 'active_support/class_inheritable_attributes'
 
 class A
   include ClassInheritableAttributes

data/test/column_alias_test.rb

@@ -5,8 +5,15 @@ 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")
+    if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
+      if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
+        records = topic.connection.select_all("SELECT id AS pk FROM topics WHERE ROWNUM < 2")
+        assert_equal(records[0].keys[0], "pk")
+      end
+    else
+      records = topic.connection.select_all("SELECT id AS pk FROM topics LIMIT 1")
+      assert_equal(records[0].keys[0], "pk")
+    end
   end
   
 end

data/test/connections/native_oci/connection.rb

@@ -0,0 +1,25 @@
+print "Using OCI Oracle\n"
+require 'fixtures/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new STDOUT
+ActiveRecord::Base.logger.level = Logger::WARN
+
+db1 = 'activerecord_unittest'
+db2 = 'activerecord_unittest2'
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => 'oci',
+  :host     => '',          # can use an oracle SID
+  :username => 'arunit',
+  :password => 'arunit',
+  :database => db1
+)
+
+Course.establish_connection(
+  :adapter  => 'oci',
+  :host     => '',          # can use an oracle SID
+  :username => 'arunit2',
+  :password => 'arunit2',
+  :database => db2
+)