r2718@asus: jeremy | 2005-10-23 14:45:30 -0700

 Ticket 2404 - fixture delete order
 r2719@asus:  jeremy | 2005-10-23 15:01:13 -0700
 Keep closer tabs on dirty, loaded, and declared fixtures.  Closes #2404.
 r2720@asus:  jeremy | 2005-10-23 16:09:19 -0700
 ensure table names are strings.  set dirty = dirty union loaded rather than dirty = loaded.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2714 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 9 insertions, 11 deletions

diff --git a/activerecord/test/column_alias_test.rb b/activerecord/test/column_alias_test.rb
index fbc93f1034..729a252eef 100644
--- a/activerecord/test/column_alias_test.rb
+++ b/activerecord/test/column_alias_test.rb
@@ -2,18 +2,16 @@ require 'abstract_unit'
 require 'fixtures/topic'
 
 class TestColumnAlias < Test::Unit::TestCase
+  fixtures :topics
+
+  QUERY = if 'OCI' == ActiveRecord::Base.connection.adapter_name
+            'SELECT id AS pk FROM topics WHERE ROWNUM < 2'
+          else
+            'SELECT id AS pk FROM topics'
+          end
 
   def test_column_alias
-    topic = Topic.find(1)
-    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("pk", records[0].keys[0])
-      end
-    else
-      records = topic.connection.select_all("SELECT id AS pk FROM topics")
-      assert_equal("pk", records[0].keys[0])
-    end
+    records = Topic.connection.select_all(QUERY)
+    assert_equal 'pk', records[0].keys[0]
   end
-  
 end