Changeset 5258
- Timestamp:
- 10/09/06 02:02:27 (3 years ago)
- Files:
-
- trunk/activerecord/CHANGELOG (modified) (1 diff)
- trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (1 diff)
- trunk/activerecord/test/connections/native_sqlite3/connection.rb (modified) (1 diff)
- trunk/railties/CHANGELOG (modified) (1 diff)
- trunk/railties/configs/databases/sqlite3.yml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activerecord/CHANGELOG
r5256 r5258 1 1 *SVN* 2 3 * Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception #6126 [wreese@gmail.com] 2 4 3 5 * Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 [jonathan] trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
r4596 r5258 20 20 :type_translation => false 21 21 ) 22 23 db.busy_timeout(config[:timeout]) unless config[:timeout].nil? 24 22 25 ConnectionAdapters::SQLiteAdapter.new(db, logger) 23 26 end trunk/activerecord/test/connections/native_sqlite3/connection.rb
r4602 r5258 12 12 13 13 def make_connection(clazz, db_file, db_definitions_file) 14 ActiveRecord::Base.configurations = { clazz.name => { :adapter => 'sqlite3', :database => db_file } }14 ActiveRecord::Base.configurations = { clazz.name => { :adapter => 'sqlite3', :database => db_file, :timeout => 5000 } } 15 15 unless File.exist?(db_file) 16 16 puts "SQLite3 database not found at #{db_file}. Rebuilding it." trunk/railties/CHANGELOG
r5236 r5258 1 1 *SVN* 2 3 * Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [DHH] 2 4 3 5 * Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [DHH]. Examples: trunk/railties/configs/databases/sqlite3.yml
r3704 r5258 4 4 adapter: sqlite3 5 5 database: db/development.sqlite3 6 timeout: 5000 6 7 7 8 # Warning: The database defined as 'test' will be erased and … … 11 12 adapter: sqlite3 12 13 database: db/test.sqlite3 14 timeout: 5000 13 15 14 16 production: 15 17 adapter: sqlite3 16 18 database: db/production.sqlite3 19 timeout: 5000
