aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-21 00:00:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-21 00:00:29 +0000
commit7a2ce50a9386a46387c114945354ba89c5fc9c30 (patch)
tree185cac50236c584974d02828054b9693f0b5b2b5 /activerecord/test
parente875b0db4714a86798a8248e91bea3fb7ffefe52 (diff)
downloadrails-7a2ce50a9386a46387c114945354ba89c5fc9c30.tar.gz
rails-7a2ce50a9386a46387c114945354ba89c5fc9c30.tar.bz2
rails-7a2ce50a9386a46387c114945354ba89c5fc9c30.zip
Improved the Oracle OCI Adapter with better performance for column reflection (from #3210), fixes to migrations (from #3476 and #3742), tweaks to unit tests (from #3610), and improved documentation (from #2446) (closes #3879) [Aggregated by schoenm@earthlink.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3623 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/associations_join_model_test.rb2
-rw-r--r--activerecord/test/fixtures/db_definitions/oci.sql3
-rw-r--r--activerecord/test/synonym_test_oci.rb2
3 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb
index 5c1510faff..f7ca3d6a84 100644
--- a/activerecord/test/associations_join_model_test.rb
+++ b/activerecord/test/associations_join_model_test.rb
@@ -96,7 +96,7 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
end
def test_has_many_class_methods_called_by_method_missing
- assert_equal categories(:general), authors(:david).categories.find_by_name('General')
+ assert_equal categories(:general), authors(:david).categories.find_all_by_name('General').first
# assert_equal nil, authors(:david).categories.find_by_name('Technology')
end
diff --git a/activerecord/test/fixtures/db_definitions/oci.sql b/activerecord/test/fixtures/db_definitions/oci.sql
index 760659d1c4..31d601b734 100644
--- a/activerecord/test/fixtures/db_definitions/oci.sql
+++ b/activerecord/test/fixtures/db_definitions/oci.sql
@@ -17,8 +17,7 @@ create sequence companies_nonstd_seq minvalue 10000;
create table accounts (
id integer not null,
firm_id integer default null references companies initially deferred disable,
- credit_limit integer default null,
- primary key (id)
+ credit_limit integer default null
);
create sequence accounts_seq minvalue 10000;
diff --git a/activerecord/test/synonym_test_oci.rb b/activerecord/test/synonym_test_oci.rb
index 4d4776c363..fcfb2f3bd1 100644
--- a/activerecord/test/synonym_test_oci.rb
+++ b/activerecord/test/synonym_test_oci.rb
@@ -10,7 +10,7 @@ class TestOracleSynonym < Test::Unit::TestCase
def test_oracle_synonym
topic = Topic.new
- subject = Subject.new
+ subject = Subject.new
assert_equal(topic.attributes, subject.attributes)
end