From 4e3d220da3938c63df4ff44215a8eb1a93335294 Mon Sep 17 00:00:00 2001 From: Raimonds Simanovskis Date: Tue, 17 Aug 2010 04:58:17 +0800 Subject: [PATCH] added dependencies in Gemfile for running ActiveRecord tests with Oracle database --- Gemfile | 12 ++++++++++++ .../test/connections/native_oracle/connection.rb | 7 +------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index b0905d98be..714437d917 100644 --- a/Gemfile +++ b/Gemfile @@ -49,3 +49,15 @@ platforms :jruby do gem "activerecord-jdbcpostgresql-adapter" end end + +# gems that are necessary for ActiveRecord tests with Oracle database +if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED'] + platforms :ruby do + gem 'ruby-oci8', ">= 2.0.4" + end + if ENV['ORACLE_ENHANCED_PATH'] + gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH'] + else + gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git" + end +end diff --git a/activerecord/test/connections/native_oracle/connection.rb b/activerecord/test/connections/native_oracle/connection.rb index bb4040058f..00164466f2 100644 --- a/activerecord/test/connections/native_oracle/connection.rb +++ b/activerecord/test/connections/native_oracle/connection.rb @@ -1,10 +1,5 @@ -# gem "rsim-activerecord-oracle_enhanced-adapter" -# gem "activerecord-oracle_enhanced-adapter", ">=1.2.1" -# uses local copy of oracle_enhanced adapter -$:.unshift("../../oracle-enhanced/lib") +# uses oracle_enhanced adapter in ENV['ORACLE_ENHANCED_PATH'] or from github.com/rsim/oracle-enhanced.git require 'active_record/connection_adapters/oracle_enhanced_adapter' -# gem "activerecord-jdbc-adapter" -# require 'active_record/connection_adapters/jdbc_adapter' # otherwise failed with silence_warnings method missing exception require 'active_support/core_ext/kernel/reporting' -- GitLab