skytools_upgrade: fix special cases
authorMarko Kreen <markokr@gmail.com>
Thu, 17 May 2012 12:47:00 +0000 (15:47 +0300)
committerMarko Kreen <markokr@gmail.com>
Thu, 17 May 2012 12:47:00 +0000 (15:47 +0300)
scripts/skytools_upgrade.py

index 7501a832452332988b53060b2af6864dbc8f33f1..5a1cefe400af56cf83799d605c62244f99e67497 100755 (executable)
@@ -43,9 +43,9 @@ def check_version(curs, schema, new_ver_str, recheck_func=None):
     funcname = "%s.version" % schema
     if not skytools.exists_function(curs, funcname, 0):
         if recheck_func is not None:
-            return recheck_func(curs)
+            return recheck_func(curs), 'NULL'
         else:
-            return 0
+            return 0, 'NULL'
     q = "select %s()" % funcname
     curs.execute(q)
     old_ver_str = curs.fetchone()[0]