Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [schoenm@earthlink.net]

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

1 files changed, 13 insertions, 8 deletions

diff --git a/activerecord/test/schema_dumper_test.rb b/activerecord/test/schema_dumper_test.rb
index e24724c9f8..e57429a4c8 100644
--- a/activerecord/test/schema_dumper_test.rb
+++ b/activerecord/test/schema_dumper_test.rb
@@ -4,16 +4,21 @@ 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
+  unless ActiveRecord::ConnectionAdapters.const_defined?(:OCIAdapter) && \
+    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OCIAdapter)
 
-      assert_match %r{create_table "accounts"}, output
-      assert_match %r{create_table "authors"}, output
-      assert_no_match %r{create_table "schema_info"}, output
+    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
 
 end