diff options
author | Vipul A M <vipulnsward@gmail.com> | 2016-04-14 18:36:08 +0530 |
---|---|---|
committer | Vipul A M <vipulnsward@gmail.com> | 2016-04-14 18:36:08 +0530 |
commit | 91798c75bc56fa706c9ed4a8dab6020462463a10 (patch) | |
tree | d955832e68a9c070277e9c14e9cf2acde30c2f52 /guides/source/configuring.md | |
parent | 53ab1ee5652ead8d5e52e5a9c177a6f8a32c75b1 (diff) | |
parent | 48ef9408bcd6c29807dbaeb5b9fc39ba5a851063 (diff) | |
download | rails-91798c75bc56fa706c9ed4a8dab6020462463a10.tar.gz rails-91798c75bc56fa706c9ed4a8dab6020462463a10.tar.bz2 rails-91798c75bc56fa706c9ed4a8dab6020462463a10.zip |
Merge pull request #24454 from iangilfillan/master
MariaDB documentation [ci skip]
Diffstat (limited to 'guides/source/configuring.md')
-rw-r--r-- | guides/source/configuring.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 6b9b95f1ab..582b14e25f 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -336,7 +336,7 @@ All these configuration options are delegated to the `I18n` library. The MySQL adapter adds one additional configuration option: -* `ActiveRecord::ConnectionAdapters::Mysql2Adapter.emulate_booleans` controls whether Active Record will consider all `tinyint(1)` columns in a MySQL database to be booleans and is true by default. +* `ActiveRecord::ConnectionAdapters::Mysql2Adapter.emulate_booleans` controls whether Active Record will consider all `tinyint(1)` columns as booleans. True by default. The schema dumper adds one additional configuration option: @@ -784,11 +784,11 @@ development: timeout: 5000 ``` -NOTE: Rails uses an SQLite3 database for data storage by default because it is a zero configuration database that just works. Rails also supports MySQL and PostgreSQL "out of the box", and has plugins for many database systems. If you are using a database in a production environment Rails most likely has an adapter for it. +NOTE: Rails uses an SQLite3 database for data storage by default because it is a zero configuration database that just works. Rails also supports MySQL (including MariaDB) and PostgreSQL "out of the box", and has plugins for many database systems. If you are using a database in a production environment Rails most likely has an adapter for it. -#### Configuring a MySQL Database +#### Configuring a MySQL or MariaDB Database -If you choose to use MySQL instead of the shipped SQLite3 database, your `config/database.yml` will look a little different. Here's the development section: +If you choose to use MySQL or MariaDB instead of the shipped SQLite3 database, your `config/database.yml` will look a little different. Here's the development section: ```yaml development: @@ -801,7 +801,7 @@ development: socket: /tmp/mysql.sock ``` -If your development computer's MySQL installation includes a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the `development` section as appropriate. +If your development database has a root user with an empty password, this configuration should work for you. Otherwise, change the username and password in the `development` section as appropriate. #### Configuring a PostgreSQL Database @@ -843,9 +843,9 @@ development: database: db/development.sqlite3 ``` -#### Configuring a MySQL Database for JRuby Platform +#### Configuring a MySQL or MariaDB Database for JRuby Platform -If you choose to use MySQL and are using JRuby, your `config/database.yml` will look a little different. Here's the development section: +If you choose to use MySQL or MariaDB and are using JRuby, your `config/database.yml` will look a little different. Here's the development section: ```yaml development: |