<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,2 +1,2 @@
 # location of folder containing activerecord, railties, etc folders for each Rails gem
-EDGE_RAILS_DIR=&quot;/path/to/copy/of/edge/rails&quot;
+ENV['EDGE_RAILS_DIR'] ||= &quot;/path/to/copy/of/edge/rails&quot;</diff>
      <filename>local/paths.rb.sample</filename>
    </modified>
    <modified>
      <diff>@@ -1,16 +1,13 @@
 print &quot;Using native Oracle\n&quot;
+require 'fileutils'
 require 'logger'
+require 'adapter_helper/oracle'
 
-ActiveRecord::Base.logger = Logger.new(&quot;debug.log&quot;)
+log_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. log]))
+FileUtils.mkdir_p log_path
+puts &quot;Logging to #{log_path}/debug.log&quot;
+ActiveRecord::Base.logger = Logger.new(&quot;#{log_path}/debug.log&quot;)
 
-db1 = 'composite_primary_keys_unittest'
-
-connection_options = {
-  :adapter  =&gt; 'oci',
-  :username =&gt; 'holstdl',
-  :password =&gt; 'holstdl',
-  :host     =&gt; 'test'
-}
-
-ActiveRecord::Base.configurations = { db1 =&gt; connection_options }
+# Adapter config setup in locals/database_connections.rb
+connection_options = AdapterHelper::MySQL.load_connection_from_env
 ActiveRecord::Base.establish_connection(connection_options)</diff>
      <filename>test/connections/native_oracle/connection.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>fc87e6d69be61f64f54fe2f8c68dcd2c2157c7c7</id>
    </parent>
  </parents>
  <author>
    <name>nicwilliams</name>
    <email>nicwilliams@c9d88e0a-f118-0410-93d6-eb14a717986d</email>
  </author>
  <url>http://github.com/drnic/composite_primary_keys/commit/bcc08ad4cd80ccd33eb22f767ffbd2c70befd1dd</url>
  <id>bcc08ad4cd80ccd33eb22f767ffbd2c70befd1dd</id>
  <committed-date>2007-09-27T14:42:16-07:00</committed-date>
  <authored-date>2007-09-27T14:42:16-07:00</authored-date>
  <message>Updated oracle connection.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/compositekeys/trunk@115 c9d88e0a-f118-0410-93d6-eb14a717986d</message>
  <tree>6402789dfbde13a139575f31a1b7fba83fdc9cd8</tree>
  <committer>
    <name>nicwilliams</name>
    <email>nicwilliams@c9d88e0a-f118-0410-93d6-eb14a717986d</email>
  </committer>
</commit>
