aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails
diff options
context:
space:
mode:
authorAntonio Cangiano <acangiano@gmail.com>2010-02-04 12:21:27 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-04 10:08:06 -0800
commit6b3fb384615003ae6cf74e8acfdb8bea9c0f683d (patch)
tree27859613701dca93312ca0e3d67373753df5aada /railties/lib/generators/rails
parent25b6b95459ae71218754e8469f77f86b676bf215 (diff)
downloadrails-6b3fb384615003ae6cf74e8acfdb8bea9c0f683d.tar.gz
rails-6b3fb384615003ae6cf74e8acfdb8bea9c0f683d.tar.bz2
rails-6b3fb384615003ae6cf74e8acfdb8bea9c0f683d.zip
Updated the database.yml file generated for ibm_db to the latest version of DB2 and the gem.
[#3852 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'railties/lib/generators/rails')
-rw-r--r--railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml31
1 files changed, 20 insertions, 11 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
index 2cecb5c879..2784a949fb 100644
--- a/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
+++ b/railties/lib/generators/rails/app/templates/config/databases/ibm_db.yml
@@ -4,23 +4,32 @@
# http://rubyforge.org/projects/rubyibm/
#
# To install the ibm_db gem:
+#
# On Linux:
-# Source the db2profile file and set the necessary environment variables:
+# . /home/db2inst1/sqllib/db2profile
+# export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+# export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib32
+# gem install ibm_db
#
+# On Mac OS X 10.5:
# . /home/db2inst1/sqllib/db2profile
-# export IBM_DB_DIR=/opt/ibm/db2/V9.1
-# export IBM_DB_LIB=/opt/ibm/db2/V9.1/lib32
+# export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+# export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib32
+# export ARCHFLAGS="-arch i386"
+# gem install ibm_db
#
-# Then issue the command: gem install ibm_db
+# On Mac OS X 10.6:
+# . /home/db2inst1/sqllib/db2profile
+# export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+# export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib64
+# export ARCHFLAGS="-arch x86_64"
+# gem install ibm_db
#
# On Windows:
-# Issue the command: gem install ibm_db
-# If prompted, select the mswin32 option
-#
-# For more details on the installation refer to http://rubyforge.org/docman/view.php/2361/7682/IBM_DB_GEM.pdf
+# Issue the command: gem install ibm_db
#
-# For more details on the connection parameters below refer to:
-# http://rubyibm.rubyforge.org/docs/adapter/0.9.0/rdoc/classes/ActiveRecord/ConnectionAdapters/IBM_DBAdapter.html
+# For more details on the installation and the connection parameters below,
+# please refer to the latest documents at http://rubyforge.org/docman/?group_id=2361
development:
adapter: ibm_db
@@ -52,7 +61,7 @@ production:
adapter: ibm_db
username: db2inst1
password:
- database: <%= app_name[0,4] %>_prd
+ database: <%= app_name[0,8] %>
#schema: db2inst1
#host: localhost
#port: 50000