[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] update71: set lastused NOT NULL NOW()



lastused in build_queue_files and build_queue_policy_files always needs to be set, so
set it in the database not in code

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 dak/dakdb/update71.py |   53 +++++++++++++++++++++++++++++++++++++++++++++++++
 dak/update_db.py      |    2 +-
 daklib/dbconn.py      |    1 -
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100755 dak/dakdb/update71.py

diff --git a/dak/dakdb/update71.py b/dak/dakdb/update71.py
new file mode 100755
index 0000000..d6bbf4a
--- /dev/null
+++ b/dak/dakdb/update71.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Make lastused in queuefiles/policyqueuefiles default now()
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Joerg Jaspert <joerg@debian.org>
+@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):
+    """
+    Make lastused in queuefiles/policyqueuefiles default now()
+    """
+    print __doc__
+    try:
+        cnf = Config()
+
+        c = self.db.cursor()
+
+        c.execute("ALTER TABLE build_queue_files ALTER COLUMN lastused SET DEFAULT now()")
+        c.execute("ALTER TABLE build_queue_files ALTER COLUMN lastused SET NOT NULL")
+        c.execute("ALTER TABLE build_queue_policy_files ALTER COLUMN lastused SET  DEFAULT now()")
+        c.execute("ALTER TABLE build_queue_policy_files ALTER COLUMN lastused SET NOT NULL")
+
+        c.execute("UPDATE config SET value = '71' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError as msg:
+        self.db.rollback()
+        raise DBUpdateError('Unable to apply sick update 71, rollback issued. Error message : %s' % (str(msg)))
diff --git a/dak/update_db.py b/dak/update_db.py
index 3e31a3b..2a94682 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 = 70
+required_database_schema = 71
 
 ################################################################################
 
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 8c5806a..dac0675 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -878,7 +878,6 @@ class BuildQueue(object):
         # Prepare BuildQueueFile object
         qf = BuildQueueFile()
         qf.build_queue_id = self.queue_id
-        qf.lastused = datetime.now()
         qf.filename = poolfile_basename
 
         targetpath = poolfile.fullpath
-- 
1.7.2.5


Reply to: