aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2008-05-04 23:32:13 +0200
committerXavier Noria <fxn@hashref.com>2008-05-04 23:32:13 +0200
commit31144d99811aaf2ad12065c81cb463ea12670fdb (patch)
treef85006dea3b683367202231c4c5366bf6c6d37a8
parent3e7bd63ec5bd60d39145b480339c17b8a5c45273 (diff)
downloadrails-31144d99811aaf2ad12065c81cb463ea12670fdb.tar.gz
rails-31144d99811aaf2ad12065c81cb463ea12670fdb.tar.bz2
rails-31144d99811aaf2ad12065c81cb463ea12670fdb.zip
revised some conventions in mysql_adapter.rb
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/mysql_adapter.rb24
1 files changed, 12 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index e742d60c5f..b62182bf00 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -146,19 +146,19 @@ module ActiveRecord
#
# Options:
#
- # * <tt>:host</tt> -- Defaults to localhost
- # * <tt>:port</tt> -- Defaults to 3306
- # * <tt>:socket</tt> -- Defaults to /tmp/mysql.sock
- # * <tt>:username</tt> -- Defaults to root
- # * <tt>:password</tt> -- Defaults to nothing
- # * <tt>:database</tt> -- The name of the database. No default, must be provided.
- # * <tt>:encoding</tt> -- (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection
- # * <tt>:sslkey</tt> -- Necessary to use MySQL with an SSL connection
- # * <tt>:sslcert</tt> -- Necessary to use MySQL with an SSL connection
- # * <tt>:sslcapath</tt> -- Necessary to use MySQL with an SSL connection
- # * <tt>:sslcipher</tt> -- Necessary to use MySQL with an SSL connection
+ # * <tt>:host</tt> - Defaults to "localhost".
+ # * <tt>:port</tt> - Defaults to "3306".
+ # * <tt>:socket</tt> - Defaults to "/tmp/mysql.sock".
+ # * <tt>:username</tt> - Defaults to "root"
+ # * <tt>:password</tt> - Defaults to nothing.
+ # * <tt>:database</tt> - The name of the database. No default, must be provided.
+ # * <tt>:encoding</tt> - (Optional) Sets the client encoding by executing "SET NAMES <encoding>" after connection.
+ # * <tt>:sslkey</tt> - Necessary to use MySQL with an SSL connection.
+ # * <tt>:sslcert</tt> - Necessary to use MySQL with an SSL connection.
+ # * <tt>:sslcapath</tt> - Necessary to use MySQL with an SSL connection.
+ # * <tt>:sslcipher</tt> - Necessary to use MySQL with an SSL connection.
#
- # By default, the MysqlAdapter will consider all columns of type tinyint(1)
+ # By default, the MysqlAdapter will consider all columns of type <tt>tinyint(1)</tt>
# as boolean. If you wish to disable this emulation (which was the default
# behavior in versions 0.13.1 and earlier) you can add the following line
# to your environment.rb file: