aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-10-03 09:04:46 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-10-03 09:04:46 -0700
commite141cbdff5655004e358f0e96fa5b606b02b761a (patch)
tree78fb24119277043284225e44cce3dae2ffc36dd7
parent2120d7b838819e14b1722f68941d9c553563a6da (diff)
parent8cc70cf32a48eb31503f828802c65f974cf559f3 (diff)
downloadrails-e141cbdff5655004e358f0e96fa5b606b02b761a.tar.gz
rails-e141cbdff5655004e358f0e96fa5b606b02b761a.tar.bz2
rails-e141cbdff5655004e358f0e96fa5b606b02b761a.zip
Merge pull request #3191 from yahonda/activerecord_unittest_db2
To support ActiveRecord unit tests for IBM DB2
-rw-r--r--Gemfile3
-rw-r--r--activerecord/test/config.example.yml2
2 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index a1585e279c..f63260a260 100644
--- a/Gemfile
+++ b/Gemfile
@@ -99,3 +99,6 @@ if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git"
end
end
+
+# A gem necessary for ActiveRecord tests with IBM DB
+gem "ibm_db" if ENV['IBM_DB']
diff --git a/activerecord/test/config.example.yml b/activerecord/test/config.example.yml
index 8c1a45430e..f450efd839 100644
--- a/activerecord/test/config.example.yml
+++ b/activerecord/test/config.example.yml
@@ -37,11 +37,13 @@ connections:
db2:
arunit:
+ adapter: ibm_db
host: localhost
username: arunit
password: arunit
database: arunit
arunit2:
+ adapter: ibm_db
host: localhost
username: arunit
password: arunit