merge from HEAD, pre-release stuff

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,11 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2004-10-15 0.7.8
+Fixed:
+- Clean out sessions / otks tables when migrating
+
+
 2004-10-11 0.7.7
 Fixed:
 - ZRoundup's search interface works now (sf bug 994957)

demo.py

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2003 Richard Jones ([email protected])
 # 
-# $Id: demo.py,v 1.10 2004-03-31 23:07:51 richard Exp $
+# $Id: demo.py,v 1.10.2.1 2004-10-14 22:28:02 richard Exp $
 
 import sys, os, string, re, urlparse
 import shutil, socket, errno, BaseHTTPServer
@@ -28,7 +28,8 @@ class config:
         class config:
             POSTGRESQL_DATABASE = {'database': 'rounduptest'}
             DATABASE = 'home'
-        module.db_nuke(config, 1)
+        if module.db_exists(config):
+            module.db_nuke(config)
 
     init.install(home, os.path.join('templates', 'classic'))
     # don't have email flying around

doc/announcement.txt

@@ -2,27 +2,9 @@ Roundup is a simple-to-use and -install issue-tracking system with
 command-line, web and e-mail interfaces. It is based on the winning design
 from Ka-Ping Yee in the Software Carpentry "Track" design competition.
 
-0.7.7 is a bug fix release, including:
+0.7.8 is a bug fix release, patching a problem in the 0.7.7 release:
 
-- ZRoundup's search interface works now (sf bug 994957)
-- fixed history display when "ascending"
-- removed references to py2.3+ boolean values (sf bug 995682)
-- fix static file path normalisation in security check (thanks David Linke)
-- less specific messages for login failures (thanks Chris Withers)
-- Reject raised against email messages should result in email rejection, not
-  discarding of the message
-- mailgw can override the MAIL_DEFAULT_CLASS
-- handle Py2.3+ datetime objects as Date specs (sf bug 971300)
-- use row locking in MySQL newid() (sf bug 1034211)
-- add sanity check for sort and group on same property (sf bug 1033477)
-- extend OTK and session table value cols to TEXT (sf bug 1031271)
-- fix lookup of REMOTE_USER (sf bug 1002923)
-- new Interval props weren't created properly in rdbms
-- date.Interval() now accepts an Interval as a spec (sf bug 1041266)
-- handle deleted properties in RDBMS history
-- apply timezone in correct direction in user input (sf bug 1013097)
-- more efficient find() in RDBMS (sf bug 1012781)
-- pydotorg-specific change to mailgw to handle bizzaro permissions ;)
+- Clean out sessions / otks tables when migrating
 
 If you're upgrading from an older version of Roundup you *must* follow
 the "Software Upgrade" guidelines given in the maintenance documentation.

roundup/__init__.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.30.2.7 2004-10-11 05:25:47 richard Exp $
+# $Id: __init__.py,v 1.30.2.8 2004-10-14 22:28:02 richard Exp $
 
 '''Roundup - issue tracking for knowledge workers.
 
@@ -68,6 +68,6 @@
 '''
 __docformat__ = 'restructuredtext'
 
-__version__ = '0.7.7'
+__version__ = '0.7.8'
 
 # vim: set filetype=python ts=4 sw=4 et si

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.23 2004-10-08 01:29:30 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.24 2004-10-14 22:28:02 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -231,6 +231,7 @@ def upgrade_db(self):
     def fix_version_3_tables(self):
         # drop the shorter VARCHAR OTK column and add a new TEXT one
         for name in ('otk', 'session'):
+            self.sql('DELETE FROM %ss'%name)
             self.sql('ALTER TABLE %ss DROP %s_value'%(name, name))
             self.sql('ALTER TABLE %ss ADD %s_value TEXT'%(name, name))