0
@@ -28,8 +28,24 @@ namespace :db do
0
 
0
   def create_database(config)
0
     begin
0
-      ActiveRecord::Base.establish_connection(config)
0
-      ActiveRecord::Base.connection
0
+      if config['adapter'] =~ /sqlite/
0
+        if File.exist?(config['database'])
0
+          $stderr.puts "#{config['database']} already exists"
0
+        else
0
+          begin
0
+            # Create the SQLite database
0
+            ActiveRecord::Base.establish_connection(config)
0
+            ActiveRecord::Base.connection
0
+          rescue
0
+            $stderr.puts $!, *($!.backtrace)
0
+            $stderr.puts "Couldn't create database for #{config.inspect}"
0
+          end
0
+        end
0
+        return # Skip the else clause of begin/rescue    
0
+      else
0
+        ActiveRecord::Base.establish_connection(config)
0
+        ActiveRecord::Base.connection
0
+      end
0
     rescue
0
       case config['adapter']
0
       when 'mysql'
0
@@ -52,10 +68,6 @@ namespace :db do
0
           $stderr.puts $!, *($!.backtrace)
0
           $stderr.puts "Couldn't create database for #{config.inspect}"
0
         end
0
-      when 'sqlite'
0
-        `sqlite "#{config['database']}"`
0
-      when 'sqlite3'
0
-        `sqlite3 "#{config['database']}"`
0
       end
0
     else
0
       $stderr.puts "#{config['database']} already exists"