Schlep around database handling functions to wizard.sql, add wizard.sql.drop hook.

[wizard.git] / wizard / app / mediawiki.py

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index 1505fa17d63647f7890ba01832c4c7c5628d0ffc..ab022b91f8f30f7ea67631313684af7041a0bbed 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -6,7 +6,7 @@ import lxml.etree
 import StringIO
 import logging
 
-from wizard import app, install, resolve, shell, util
+from wizard import app, install, resolve, shell, sql, util
 from wizard.app import php
 
 def make_filename_regex(var):
@@ -84,12 +84,15 @@ class Application(app.Application):
         results = result.rstrip().split()
         if not results or not results[-1] == "Done.":
             raise app.UpgradeFailure(result)
+    @app.throws_database_errors
     def backup(self, deployment, backup_dir, options):
-        app.backup_database(backup_dir, deployment)
+        sql.backup(backup_dir, deployment)
+    @app.throws_database_errors
     def restore(self, deployment, backup_dir, options):
-        app.restore_database(backup_dir, deployment)
+        sql.restore(backup_dir, deployment)
+    @app.throws_database_errors
     def remove(self, deployment, options):
-        app.remove_database(deployment)
+        sql.drop(deployment.dsn)
     def researchFilter(self, filename, added, deleted):
         if filename == "LocalSettings.php":
             return added == deleted == 10 or added == deleted == 9