aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/tasks/sqlite_database_tasks.rb')
-rw-r--r--activerecord/lib/active_record/tasks/sqlite_database_tasks.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
index 8f8021f47c..4d3cba8a50 100644
--- a/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/sqlite_database_tasks.rb
@@ -1,8 +1,8 @@
class ActiveRecord::Tasks::SQLiteDatabaseTasks
delegate :connection, :establish_connection, :to => ActiveRecord::Base
- def initialize(configuration)
- @configuration = configuration
+ def initialize(configuration, root = Rails.root)
+ @configuration, @root = configuration, root
end
def create
@@ -18,7 +18,7 @@ class ActiveRecord::Tasks::SQLiteDatabaseTasks
def drop
require 'pathname'
path = Pathname.new configuration['database']
- file = path.absolute? ? path.to_s : File.join(Rails.root, path)
+ file = path.absolute? ? path.to_s : File.join(root, path)
FileUtils.rm(file)
end
@@ -30,4 +30,8 @@ class ActiveRecord::Tasks::SQLiteDatabaseTasks
def configuration
@configuration
end
+
+ def root
+ @root
+ end
end