Permalink
Browse files

use database from ARUNIT_DB_NAME environment variable when running te…

…sts on Oracle
  • Loading branch information...
1 parent 2570fda commit f10fb1c4e9c7856dc740ec21f2eaceba4e8b8afd @rsim rsim committed with tenderlove Aug 23, 2010
Showing with 3 additions and 19 deletions.
  1. +3 −19 activerecord/test/connections/native_oracle/connection.rb
@@ -8,32 +8,22 @@
require_dependency 'models/course'
require 'logger'
-# ActiveRecord::Base.logger = Logger.new STDOUT
-# ActiveRecord::Base.logger.level = Logger::WARN
ActiveRecord::Base.logger = Logger.new("debug.log")
# Set these to your database connection strings
-db = ENV['ARUNIT_DB_NAME'] = 'orcl'
+ENV['ARUNIT_DB_NAME'] ||= 'orcl'
ActiveRecord::Base.configurations = {
'arunit' => {
:adapter => 'oracle_enhanced',
- :database => db,
- :host => "localhost", # used just by JRuby to construct JDBC connect string
- # :adapter => "jdbc",
- # :driver => "oracle.jdbc.driver.OracleDriver",
- # :url => "jdbc:oracle:thin:@localhost:1521:#{db}",
+ :database => ENV['ARUNIT_DB_NAME'],
:username => 'arunit',
:password => 'arunit',
:emulate_oracle_adapter => true
},
'arunit2' => {
:adapter => 'oracle_enhanced',
- :database => db,
- :host => "localhost", # used just by JRuby to construct JDBC connect string
- # :adapter => "jdbc",
- # :driver => "oracle.jdbc.driver.OracleDriver",
- # :url => "jdbc:oracle:thin:@localhost:1521:#{db}",
+ :database => ENV['ARUNIT_DB_NAME'],
:username => 'arunit2',
:password => 'arunit2',
:emulate_oracle_adapter => true
@@ -43,9 +33,6 @@
ActiveRecord::Base.establish_connection 'arunit'
Course.establish_connection 'arunit2'
-# ActiveRecord::Base.connection.execute %q{alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'}
-# ActiveRecord::Base.connection.execute %q{alter session set nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'} rescue nil
-
# for assert_queries test helper
ActiveRecord::Base.connection.class.class_eval do
IGNORED_SELECT_SQL = [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from ((all|user)_tab_columns|(all|user)_triggers|(all|user)_constraints)/im]
@@ -58,6 +45,3 @@ def select_with_query_record(sql, name = nil, return_column_names = false)
alias_method_chain :select, :query_record
end
-
-# For JRuby Set default $KCODE to UTF8
-$KCODE = "UTF8" if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'

0 comments on commit f10fb1c

Please sign in to comment.