From b6171e71050dda9e3b4ebfccd440a180283667ce Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 5 Nov 2006 02:01:31 +0000 Subject: SQLite: count(distinct) queries supported in >= 3.2.6, fix calculations workaround, remove count(distinct) query rewrite, cleanup test connection scripts. Closes #6544. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5426 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../test/connections/native_sqlite/connection.rb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'activerecord/test/connections/native_sqlite/connection.rb') diff --git a/activerecord/test/connections/native_sqlite/connection.rb b/activerecord/test/connections/native_sqlite/connection.rb index 14ae999023..028ecee4df 100644 --- a/activerecord/test/connections/native_sqlite/connection.rb +++ b/activerecord/test/connections/native_sqlite/connection.rb @@ -10,25 +10,16 @@ BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures') sqlite_test_db = "#{BASE_DIR}/fixture_database.sqlite" sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite" -def make_connection(clazz, db_file, db_definitions_file) +def make_connection(clazz, db_file) ActiveRecord::Base.configurations = { clazz.name => { :adapter => 'sqlite', :database => db_file } } unless File.exist?(db_file) puts "SQLite database not found at #{db_file}. Rebuilding it." 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(clazz.name) - script = File.read("#{BASE_DIR}/db_definitions/#{db_definitions_file}") - # SQLite-Ruby has problems with semi-colon separated commands, so split and execute one at a time - script.split(';').each do - |command| - clazz.connection.execute(command) unless command.strip.empty? - end - else - clazz.establish_connection(clazz.name) end + clazz.establish_connection(clazz.name) end -make_connection(ActiveRecord::Base, sqlite_test_db, 'sqlite.sql') -make_connection(Course, sqlite_test_db2, 'sqlite2.sql') -load(File.join(BASE_DIR, 'db_definitions', 'schema.rb')) +make_connection(ActiveRecord::Base, sqlite_test_db) +make_connection(Course, sqlite_test_db2) -- cgit v1.2.3