fixed schema migration problem when Class keys were removed

Richard Jones · Richard Jones · commit 574a14c9b9f6 · 2006-02-09T23:53:11.000Z
fixed lookup of config in all-hell's-broken-loose cgi.Client error handler

fixed metakit use of is_stopword
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -17,6 +17,7 @@ Fixed:
 - roundup-admin import wasn't indexing message content
 - allow dispname to be passed to renderWith (sf bug 1424587)
 - rename dispname to @dispname to avoid name clashes in the future
+- fixed schema migration problem when Class keys were removed
 
 
 2006-02-03 1.0.1
diff --git a/doc/upgrading.txt b/doc/upgrading.txt
@@ -40,6 +40,7 @@ and ``issue.index.html`` pages to change ``dispname`` to ``@dispname``.
 A side-effect of this change is that the renderWith method used in the
 ``home.html`` page may now take a dispname argument.
 
+
 1.1 "Clear this message"
 ------------------------
 
diff --git a/roundup/backends/back_metakit.py b/roundup/backends/back_metakit.py
@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.105 2006-02-07 04:14:02 richard Exp $
+# $Id: back_metakit.py,v 1.106 2006-02-09 23:53:10 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -46,7 +46,7 @@
 import metakit
 from sessions_dbm import Sessions, OneTimeKeys
 import re, marshal, os, sys, time, calendar, shutil
-from indexer_common import Indexer, is_stopword
+from indexer_common import Indexer
 import locking
 from roundup.date import Range
 from blobfiles import files_in_dir
@@ -2027,7 +2027,7 @@ def add_text(self, identifier, text, mime_type='text/plain'):
         wordlist = re.findall(r'\b\w{2,25}\b', text.upper())
         words = {}
         for word in wordlist:
-            if not is_stopword(word):
+            if not self.is_stopword(word):
                 words[word] = 1
         words = words.keys()
 
diff --git a/roundup/backends/rdbms_common.py b/roundup/backends/rdbms_common.py
@@ -1,4 +1,21 @@
-Id$
+#
+# Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
+# This module is free software, and you may redistribute it and/or modify
+# under the same terms as Python, so long as this copyright message and
+# disclaimer are retained in their original form.
+#
+# IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR
+# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
+# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+#
+#$Id: rdbms_common.py,v 1.167 2006-02-09 23:53:11 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -401,7 +418,10 @@ def update_class(self, spec, old_spec, force=0):
         # detect key prop change for potential index change
         keyprop_changes = {}
         if new_spec[0] != old_spec[0]:
-            keyprop_changes = {'remove': old_spec[0], 'add': new_spec[0]}
+            if old_spec[0]:
+                keyprop_changes['remove'] = old_spec[0]
+            if new_spec[0]:
+                keyprop_changes['add'] = new_spec[0]
 
         # detect multilinks that have been removed, and drop their table
         old_has = {}
diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py
@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.221 2006-02-08 05:33:11 a1s Exp $
+# $Id: client.py,v 1.222 2006-02-09 23:53:11 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -46,8 +46,8 @@ def clean_message_callback(match, ok={'a':1,'i':1,'b':1,'br':1}):
         return match.group(1)
     return '&lt;%s&gt;'%match.group(2)
 
-error_message = ""'''<html><head><title>Roundup error</title></head><body>
-<h1>An error has occurred</h1>
+error_message = ""'''<html><head><title>An error has occurred</title></head>
+<body><h1>An error has occurred</h1>
 <p>A problem was encountered processing your request.
 The tracker maintainers have been notified of the problem.</p>
 </body></html>'''
@@ -308,7 +308,7 @@ def inner_main(self):
             self.error_message.append(self._('Form Error: ') + str(e))
             self.write_html(self.renderContext())
         except:
-            if self.db.config.WEB_DEBUG:
+            if self.instance.config.WEB_DEBUG:
                 self.write_html(cgitb.html(i18n=self.translator))
             else:
                 self.mailer.exception_message()
diff --git a/test/db_test_base.py b/test/db_test_base.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.66 2006-02-07 04:59:05 richard Exp $
+# $Id: db_test_base.py,v 1.67 2006-02-09 23:53:11 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -1355,6 +1355,20 @@ def test_changeClassKey(self):
         # confirm journal's ok
         self.db.getjournal('a', aid)
 
+    def test_removeClassKey(self):
+        self.init_amod()
+        aid = self.db.a.create(name='apple')
+        self.assertEqual(self.db.a.lookup('apple'), aid)
+        self.db.commit(); self.db.close()
+
+        self.db = self.module.Database(config, 'admin')
+        a = self.module.Class(self.db, "a", name=String(), newstr=String())
+        self.db.post_init()
+
+        aid2 = self.db.a.create(name='apple', newstr='booz')
+        self.db.commit()
+
+
     def init_amodml(self):
         self.db = self.module.Database(config, 'admin')
         a = self.module.Class(self.db, "a", name=String(),
