0
@@ -1,2 +1,2 @@
0
 # location of folder containing activerecord, railties, etc folders for each Rails gem
0
-EDGE_RAILS_DIR="/path/to/copy/of/edge/rails"
0
+ENV['EDGE_RAILS_DIR'] ||= "/path/to/copy/of/edge/rails"

0
@@ -1,16 +1,13 @@
0
 print "Using native Oracle\n"
0
+require 'fileutils'
0
 require 'logger'
0
+require 'adapter_helper/oracle'
0
 
0
-ActiveRecord::Base.logger = Logger.new("debug.log")
0
+log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
0
+FileUtils.mkdir_p log_path
0
+puts "Logging to #{log_path}/debug.log"
0
+ActiveRecord::Base.logger = Logger.new("#{log_path}/debug.log")
0
 
0
-db1 = 'composite_primary_keys_unittest'
0
-
0
-connection_options = {
0
-  :adapter  => 'oci',
0
-  :username => 'holstdl',
0
-  :password => 'holstdl',
0
-  :host     => 'test'
0
-}
0
-
0
-ActiveRecord::Base.configurations = { db1 => connection_options }
0
+# Adapter config setup in locals/database_connections.rb
0
+connection_options = AdapterHelper::MySQL.load_connection_from_env
0
 ActiveRecord::Base.establish_connection(connection_options)