aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-05-24 19:46:46 +0100
committerLouise Crow <louise.crow@gmail.com>2013-05-28 12:18:41 +0100
commitf81b97738c49b2d4cece1b58252a4cd03160c3f4 (patch)
tree682da4e1220ec5e7c6771901d1142c7e64cafb04
parenta08b5855cc47d68821b20af3ca7bf645d3335faa (diff)
Update the install documentation for the new database.yml param
-rw-r--r--config/database.yml-example2
-rw-r--r--doc/INSTALL.md3
2 files changed, 4 insertions, 1 deletions
diff --git a/config/database.yml-example b/config/database.yml-example
index b1597e6fe..e48577f23 100644
--- a/config/database.yml-example
+++ b/config/database.yml-example
@@ -19,6 +19,8 @@ test:
password: <password>
host: localhost
port: 5432
+# Uncomment the following if the user is not a postgres superuser
+# constraint_disabling: false
production:
adapter: postgresql
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 09bc8fd43..b6e8d2265 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -130,7 +130,8 @@ username and password of your postgres database.
Make sure that the user specified in database.yml exists, and has full
permissions on these databases. As they need the ability to turn off
constraints whilst running the tests they also need to be a superuser.
-(See http://dev.rubyonrails.org/ticket/9981)
+If you don't want your database user to be a superuser, you can add a line
+`disable_constraints: false` to the test config in database.yml, as seen in database.yml-example
You can create a `foi` user from the command line, thus: