Skip to content
Browse files

added dependencies in Gemfile for running ActiveRecord tests with Ora…

…cle database
  • Loading branch information...
1 parent 047e411 commit d1480926e8887e4e59d1eac5a2c266b37a7af172 @rsim rsim committed with tenderlove
Showing with 13 additions and 6 deletions.
  1. +12 −0 Gemfile
  2. +1 −6 activerecord/test/connections/native_oracle/connection.rb
View
12 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
View
7 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'

0 comments on commit d148092

Please sign in to comment.
Something went wrong with that request. Please try again.