From 841d29639b1731a7d0fb844cbd92168b8ae8d84f Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 6 Jun 2011 15:16:52 -0700 Subject: updating configs for oracle --- activerecord/test/config.example.yml | 26 +++++++++++++------------- activerecord/test/connections/oracle.rb | 8 +------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/activerecord/test/config.example.yml b/activerecord/test/config.example.yml index 6ed38db66d..481bdc13dd 100644 --- a/activerecord/test/config.example.yml +++ b/activerecord/test/config.example.yml @@ -91,19 +91,19 @@ connections: arunit2: username: admin - oracle: - arunit: - adapter: oracle_enhanced - database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %> - username: arunit - password: arunit - emulate_oracle_adapter: true - arunit: - adapter: oracle_enhanced - database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %> - username: arunit2 - password: arunit2 - emulate_oracle_adapter: true + oracle_enhanced: + arunit: + adapter: oracle_enhanced + database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %> + username: <%= ENV['ARUNIT_USER_NAME'] || 'arunit' %> + password: <%= ENV['ARUNIT_PASSWORD'] || 'arunit' %> + emulate_oracle_adapter: true + arunit2: + adapter: oracle_enhanced + database: <%= ENV['ARUNIT_DB_NAME'] || 'orcl' %> + username: <%= ENV['ARUNIT2_USER_NAME'] || 'arunit2' %> + password: <%= ENV['ARUNIT2_PASSWORD'] || 'arunit2' %> + emulate_oracle_adapter: true postgresql: arunit: diff --git a/activerecord/test/connections/oracle.rb b/activerecord/test/connections/oracle.rb index dc64f7c5fc..352028ce33 100644 --- a/activerecord/test/connections/oracle.rb +++ b/activerecord/test/connections/oracle.rb @@ -1,7 +1 @@ -ENV['ARCONN'] = 'oracle' - -# 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' - -# otherwise failed with silence_warnings method missing exception -require 'active_support/core_ext/kernel/reporting' +ENV['ARCONN'] = 'oracle_enhanced' -- cgit v1.2.3