diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-21 17:20:51 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-21 17:20:51 +0000 |
commit | 39814fcce0b429eb06654600e4669f1405ffa7d9 (patch) | |
tree | bc5cbe7888b3c31b1e2a92f246512218014fdf76 /activerecord/test/connections/native_sqlite3 | |
parent | 1d4f4cdfe22cbe4962ae8953c96bc5c70d8d4e6a (diff) | |
download | rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.gz rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.bz2 rails-39814fcce0b429eb06654600e4669f1405ffa7d9.zip |
Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/connections/native_sqlite3')
-rw-r--r-- | activerecord/test/connections/native_sqlite3/connection.rb | 2 | ||||
-rw-r--r-- | activerecord/test/connections/native_sqlite3/in_memory_connection.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/connections/native_sqlite3/connection.rb b/activerecord/test/connections/native_sqlite3/connection.rb index c0cfaadcfa..c517c2375e 100644 --- a/activerecord/test/connections/native_sqlite3/connection.rb +++ b/activerecord/test/connections/native_sqlite3/connection.rb @@ -6,7 +6,7 @@ ActiveRecord::Base.logger = Logger.new("debug.log") class SqliteError < StandardError end -BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures') +BASE_DIR = FIXTURES_ROOT sqlite_test_db = "#{BASE_DIR}/fixture_database.sqlite3" sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3" diff --git a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb index 2adf8b37af..6aba9719bb 100644 --- a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb +++ b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb @@ -8,11 +8,11 @@ end def make_connection(clazz, db_definitions_file) clazz.establish_connection(:adapter => 'sqlite3', :database => ':memory:') - File.read("#{File.dirname(__FILE__)}/../../schema/#{db_definitions_file}").split(';').each do |command| + File.read(SCHEMA_ROOT + "/#{db_definitions_file}").split(';').each do |command| clazz.connection.execute(command) unless command.strip.empty? end end make_connection(ActiveRecord::Base, 'sqlite.sql') make_connection(Course, 'sqlite2.sql') -load("#{File.dirname(__FILE__)}/../../schema/schema.rb") +load(SCHEMA_ROOT + "/schema.rb") |