From: Joerg Jaspert Date: Sun, 12 Aug 2012 12:46:23 +0000 (+0200) Subject: Merge remote-tracking branch 'ansgar/pu/multiarchive-2' X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=e08cad76c8f65aed94a30219e2d6dcafa816ba2a;hp=2f2fe3780008c837ff2951b276653f74ad75cf8b Merge remote-tracking branch 'ansgar/pu/multiarchive-2' * ansgar/pu/multiarchive-2: dak/dakdb/update79.py: add world schema and new stable views Signed-off-by: Joerg Jaspert --- diff --git a/dak/dakdb/update79.py b/dak/dakdb/update79.py new file mode 100644 index 00000000..67ad01a6 --- /dev/null +++ b/dak/dakdb/update79.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python +# coding=utf8 + +""" +add world schema and new stable views + +@contact: Debian FTP Master +@copyright: 2012 Ansgar Burchardt +@license: GNU General Public License version 2 or later +""" + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +################################################################################ + +import psycopg2 +from daklib.dak_exceptions import DBUpdateError +from daklib.config import Config + +################################################################################ +def do_update(self): + print __doc__ + try: + cnf = Config() + + c = self.db.cursor() + + c.execute("CREATE SCHEMA world"); + c.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA world GRANT SELECT ON TABLES TO PUBLIC") + c.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA world GRANT ALL ON TABLES TO ftpmaster") + c.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA world GRANT SELECT ON SEQUENCES TO PUBLIC") + c.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA world GRANT ALL ON SEQUENCES TO ftpmaster") + c.execute("ALTER DEFAULT PRIVILEGES IN SCHEMA world GRANT ALL ON FUNCTIONS TO ftpmaster") + c.execute(""" + CREATE OR REPLACE VIEW world."files-1" AS + SELECT + files.id AS id, + CONCAT(component.name, '/', files.filename) AS filename, + files.size AS size, + files.md5sum AS md5sum, + files.sha1sum AS sha1sum, + files.sha256sum AS sha256sum, + files.last_used AS last_used, + files.created AS created, + files.modified AS modified + FROM files + JOIN files_archive_map fam ON files.id = fam.file_id + JOIN component ON fam.component_id = component.id + WHERE fam.archive_id = (SELECT id FROM archive WHERE name IN ('backports', 'ftp-master', 'security')) + """) + + + c.execute("UPDATE config SET value = '78' WHERE name = 'db_revision'") + self.db.commit() + + except psycopg2.ProgrammingError as msg: + self.db.rollback() + raise DBUpdateError('Unable to apply sick update 78, rollback issued. Error message: {0}'.format(msg)) diff --git a/dak/update_db.py b/dak/update_db.py index 15520813..ba79c0ed 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -46,7 +46,7 @@ from daklib.daklog import Logger ################################################################################ Cnf = None -required_database_schema = 78 +required_database_schema = 79 ################################################################################