# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1264444050 -3600
# Node ID b4e186da08f2eee45d07c6dc114856c688aaa9d3
# Parent  2d2aa2526c560dfa9ad91f1827159ce4a35c0080
handle lgc.adbh api changes within regards of backup/restore:

* new backup_commands method instead of backup_command
* some backend still return command as string as expected by os.system, not subprocess.call

diff -r 2d2aa2526c56 -r b4e186da08f2 server/sqlutils.py
--- a/server/sqlutils.py	Mon Jan 25 19:24:09 2010 +0100
+++ b/server/sqlutils.py	Mon Jan 25 19:27:30 2010 +0100
@@ -33,6 +33,15 @@
 lgc.USE_MX_DATETIME = False
 SQL_PREFIX = 'cw_'
 
+def bw_run_command(cmd):
+    """backup/restore command are string w/ lgc < 0.47, lists with earlier versions
+    """
+    if isinstance(cmd, basestring):
+        print cmd
+        return os.system(cmd)
+    print ' '.join(cmd)
+    return subprocess.call(cmd)
+
 
 def sqlexec(sqlstmts, cursor_or_execute, withpb=not os.environ.get('APYCOT_ROOT'),
             pbtitle='', delimiter=';'):
@@ -171,11 +180,12 @@
         return cnx
 
     def backup_to_file(self, backupfile):
-        cmd = self.dbhelper.backup_command(self.dbname, self.dbhost,
-                                           self.dbuser, backupfile,
-                                           keepownership=False)
-        if subprocess.call(cmd):
-            raise Exception('Failed command: %s' % cmd)
+        for cmd in self.dbhelper.backup_commands(self.dbname, self.dbhost,
+                                                 self.dbuser, backupfile,
+                                                 keepownership=False):
+            if bw_run_command(cmd):
+                if not confirm('-> Failed. Continue anyway?', default='n'):
+                    raise Exception('Failed command: %s' % cmd)
 
     def restore_from_file(self, backupfile, confirm, drop=True):
         for cmd in self.dbhelper.restore_commands(self.dbname, self.dbhost,
@@ -183,9 +193,8 @@
                                                   self.encoding,
                                                   keepownership=False,
                                                   drop=drop):
-            if subprocess.call(cmd):
-                print '-> Failed command: %s' % cmd
-                if not confirm('Continue anyway?', default='n'):
+            if bw_run_command(cmd):
+                if not confirm('Failed. Continue anyway?', default='n'):
                     raise Exception('Failed command: %s' % cmd)
 
     def merge_args(self, args, query_args):