Merge branch 'master' into maintainer

[dak.git] / dak / dakdb / update29.py

diff --git a/dak/dakdb/update29.py b/dak/dakdb/update29.py
index 5df1ad810091f4ef09981101da7094e4e8d46cbb..d25c1011a56fbba16449f940f7972798b17f74c2 100644 (file)
--- a/dak/dakdb/update29.py
+++ b/dak/dakdb/update29.py
@@ -38,12 +38,7 @@ def do_update(self):
 
     try:
         c = self.db.cursor()
-        c.execute("""DROP AGGREGATE comma_separated_list(                   BASETYPE = text,
-                   SFUNC = comma_concat,
-                   STYPE = text,
-                   INITCOND = ''
-);""" )
-        c.execute("""DROP FUNCTION comma_concat(text, text);""" );
+        c.execute("""DROP FUNCTION comma_concat(text, text) CASCADE;""" );
         c.execute("""DROP TABLE pending_content_associations;""")
         c.execute("""DROP TABLE content_associations;""")
         c.execute("""DROP TABLE content_file_names;""")