aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/connections
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-14 23:48:39 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-14 23:48:39 +0000
commitbfa6bfc24a0034ae599861a6e8655df024973eed (patch)
treeb5e9e0cb86fd1584727961e2e6e1a3d6a7959355 /activerecord/test/connections
parent066988d2f330961503a58dc139a8f10439575fdf (diff)
downloadrails-bfa6bfc24a0034ae599861a6e8655df024973eed.tar.gz
rails-bfa6bfc24a0034ae599861a6e8655df024973eed.tar.bz2
rails-bfa6bfc24a0034ae599861a6e8655df024973eed.zip
Fixed that SQLite3 exceptions are caught and reported properly #823 [yerejm]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@909 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/connections')
-rw-r--r--activerecord/test/connections/native_sqlite/connection.rb2
-rw-r--r--activerecord/test/connections/native_sqlite3/connection.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/connections/native_sqlite/connection.rb b/activerecord/test/connections/native_sqlite/connection.rb
index e702006bc2..b686c7705b 100644
--- a/activerecord/test/connections/native_sqlite/connection.rb
+++ b/activerecord/test/connections/native_sqlite/connection.rb
@@ -13,7 +13,7 @@ sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite"
def make_connection(clazz, db_file, db_definitions_file)
unless File.exist?(db_file)
puts "SQLite database not found at #{db_file}. Rebuilding it."
- sqlite_command = "sqlite #{db_file} 'create table a (a integer); drop table a;'"
+ sqlite_command = %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)
clazz.establish_connection(
diff --git a/activerecord/test/connections/native_sqlite3/connection.rb b/activerecord/test/connections/native_sqlite3/connection.rb
index 640a2b97f5..07856cc677 100644
--- a/activerecord/test/connections/native_sqlite3/connection.rb
+++ b/activerecord/test/connections/native_sqlite3/connection.rb
@@ -13,7 +13,7 @@ sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3"
def make_connection(clazz, db_file, db_definitions_file)
unless File.exist?(db_file)
puts "SQLite3 database not found at #{db_file}. Rebuilding it."
- sqlite_command = "sqlite3 #{db_file} 'create table a (a integer); drop table a;'"
+ sqlite_command = %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)
clazz.establish_connection(