Added migration support for Oracle (closes #2647) [Michael Schoen]

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

1 files changed, 8 insertions, 4 deletions

diff --git a/activerecord/test/readonly_test.rb b/activerecord/test/readonly_test.rb
index d621432596..f8acc16493 100755
--- a/activerecord/test/readonly_test.rb
+++ b/activerecord/test/readonly_test.rb
@@ -77,10 +77,14 @@ class ReadOnlyTest < Test::Unit::TestCase
       assert !Post.find(1, :readonly => false).readonly?
     end
 
-    Post.constrain(:joins => ', developers') do 
-      assert Post.find(1).readonly?
-      assert Post.find(1, :readonly => true).readonly?
-      assert !Post.find(1, :readonly => false).readonly?
+    # Oracle barfs on this because the join includes unqualified and
+    # conflicting column names
+    unless current_adapter?(:OCIAdapter)
+      Post.constrain(:joins => ', developers') do 
+        assert Post.find(1).readonly?
+        assert Post.find(1, :readonly => true).readonly?
+        assert !Post.find(1, :readonly => false).readonly?
+      end
     end
 
     Post.constrain(:readonly => true) do