From df62dea1ff1461322e54bba7bbbee227a3e32b4e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 20 Mar 2006 06:05:16 +0000 Subject: Fixed that schema changes while the database was open would break any connections to a SQLite database (now we reconnect if that error is throw) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3997 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../active_record/connection_adapters/sqlite_adapter.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index bc874ee58b..ab5c9b822f 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -135,6 +135,13 @@ module ActiveRecord def execute(sql, name = nil) #:nodoc: log(sql, name) { @connection.execute(sql) } + rescue ActiveRecord::StatementInvalid => exception + if exception.message =~ /database schema has changed/ + reconnect! + retry + else + raise + end end def update(sql, name = nil) #:nodoc: @@ -341,13 +348,18 @@ module ActiveRecord # # SELECT COUNT(ArtistID) FROM (SELECT DISTINCT ArtistID FROM CDs); def execute(sql, name = nil) #:nodoc: + super(rewrite_count_distinct_queries(sql), name) + end + + def rewrite_count_distinct_queries(sql) if sql =~ /count\(distinct ([^\)]+)\)( AS \w+)? (.*)/i distinct_column = $1 distinct_query = $3 column_name = distinct_column.split('.').last - sql = "SELECT COUNT(#{column_name}) FROM (SELECT DISTINCT #{distinct_column} #{distinct_query})" + "SELECT COUNT(#{column_name}) FROM (SELECT DISTINCT #{distinct_column} #{distinct_query})" + else + sql end - log(sql, name) { @connection.execute(sql) } end end -- cgit v1.2.3