aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-26 21:43:48 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-26 21:43:48 +0000
commit1886de8612ace10719d09902d550e1ac077325e5 (patch)
tree0198c67664f69135f77274b81b3555f2345c93a1 /activerecord
parentc4f1979db5b69f85b1e51bfa9a3e119bc71a4e24 (diff)
downloadrails-1886de8612ace10719d09902d550e1ac077325e5.tar.gz
rails-1886de8612ace10719d09902d550e1ac077325e5.tar.bz2
rails-1886de8612ace10719d09902d550e1ac077325e5.zip
Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 (closes #4390) [schoenm@earthlink.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/connection_adapters/oracle_adapter.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index a1a0e63c86..81b674864d 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [schoenm@earthlink.net]
+
* Change periods (.) in table aliases to _'s. Closes #4251 [jeff@ministrycentered.com]
* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x. Closes #4348 [Rick]
diff --git a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
index c752451bff..00d8aa7330 100644
--- a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
@@ -537,6 +537,7 @@ begin
def describe(name, type)
@desc ||= @@env.alloc(OCIDescribe)
+ @desc.attrSet(OCI_ATTR_DESC_PUBLIC, -1) if VERSION >= '0.1.14'
@desc.describeAny(@svc, name, type)
@desc.attrGet(OCI_ATTR_PARAM)
end