Changeset 909

Timestamp:

03/14/05 23:48:39 (4 years ago)

Author:

david

Message:

Fixed that SQLite3 exceptions are caught and reported properly #823 [yerejm]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb (modified) (1 diff)
• trunk/activerecord/test/connections/native_sqlite/connection.rb (modified) (1 diff)
• trunk/activerecord/test/connections/native_sqlite3/connection.rb (modified) (1 diff)
• trunk/activerecord/test/finder_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that SQLite3 exceptions are caught and reported properly #823 [yerejm]
-
-* Added that all types of after_find/after_initialized callbacks are triggered if the explicit implementation is present, not only the explicit implementation itself

trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -406 +406 @@
-              nil
-            end
-
+Exception 
-            log_info("#{e.message}: #{sql}", name, 0)
-            raise ActiveRecord::StatementInvalid, "#{e.message}: #{sql}"

trunk/activerecord/test/connections/native_sqlite/connection.rb

@@ -14 +14 @@
-  unless File.exist?(db_file)
-    puts "SQLite database not found at #{db_file}. Rebuilding it."
-"sqlite #{db_file} 'create table a (a integer); drop table a;'"
+%Q{sqlite #{db_file} "create table a (a integer); drop table a;"}
-    puts "Executing '#{sqlite_command}'"
-    raise SqliteError.new("Seems that there is no sqlite executable available") unless system(sqlite_command)

trunk/activerecord/test/connections/native_sqlite3/connection.rb

@@ -14 +14 @@
-  unless File.exist?(db_file)
-    puts "SQLite3 database not found at #{db_file}. Rebuilding it."
-"sqlite3 #{db_file} 'create table a (a integer); drop table a;'"
+%Q{sqlite3 #{db_file} "create table a (a integer); drop table a;"}
-    puts "Executing '#{sqlite_command}'"
-    raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command)

trunk/activerecord/test/finder_test.rb

@@ -232 +232 @@
-    assert_equal 1, topics.size
-    assert_equal "Mary", topics[0].author_name
+  end
+
+  def test_find_with_bad_sql
+    assert_raises(ActiveRecord::StatementInvalid) { Topic.find_by_sql "select 1 from badtable" }
-  end
-