diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/configs/databases/sqlite3.yml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 4ef9915ff5..8ea81f7cd2 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [DHH] + * Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [DHH]. Examples: ./script/generate model post title:string created_on:date body:text published:boolean diff --git a/railties/configs/databases/sqlite3.yml b/railties/configs/databases/sqlite3.yml index 6f8cbaf18f..60d8563a42 100644 --- a/railties/configs/databases/sqlite3.yml +++ b/railties/configs/databases/sqlite3.yml @@ -3,6 +3,7 @@ development: adapter: sqlite3 database: db/development.sqlite3 + timeout: 5000 # Warning: The database defined as 'test' will be erased and # re-generated from your development database when you run 'rake'. @@ -10,7 +11,9 @@ development: test: adapter: sqlite3 database: db/test.sqlite3 + timeout: 5000 production: adapter: sqlite3 database: db/production.sqlite3 + timeout: 5000 |