issue2551376: Fix tracebacks in item templates

Author: schlatterbeck

CHANGES.txt

@@ -91,7 +91,8 @@ Fixed:
   using -L and -d with roundup-server. (John Rouillard)
 - Allow the specification of a "form" parameter for Date fields to make
   the popup calendar work when the enclosing form has a name different
-  from "itemSynopsis".
+  from "itemSynopsis". (Ralf Schlatterbeck)
+- issue2551376: Fix tracebacks in item templates (Ralf Schlatterbeck)
 
 Features:
 

roundup/backends/back_postgresql.py

@@ -116,7 +116,7 @@ def get_database_schema_names(config):
         #
         # Database name is any character sequence not including a " or
         # whitespace. Arguably both are allowed by:
-        # 
+        #
         #  https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
         #
         # with suitable quoting but ... really.
@@ -170,7 +170,7 @@ def get_database_user_name(config):
         #
         # Database name is any character sequence not including a " or
         # whitespace. Arguably both are allowed by:
-        # 
+        #
         #  https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
         #
         # with suitable quoting but ... really.
@@ -560,14 +560,51 @@ def clear(self):
             self.cursor.execute('DROP SEQUENCE _%s_ids' % cn)
             self.cursor.execute('CREATE SEQUENCE _%s_ids' % cn)
 
+    def getnode (self, classname, nodeid, fetch_multilinks=True):
+        """ For use of savepoint see 'Class' below """
+        self.sql('savepoint sp')
+        try:
+            getnode = rdbms_common.Database.getnode
+            return getnode(self, classname, nodeid, fetch_multilinks)
+        except psycopg2.errors.DataError as err:
+            self.sql('rollback to savepoint sp')
+            raise hyperdb.HyperdbValueError(str (err).split('\n')[0])
+
 
 class PostgresqlClass:
     order_by_null_values = '(%s is not NULL)'
     case_insensitive_like = 'ILIKE'
 
 
 class Class(PostgresqlClass, rdbms_common.Class):
-    pass
+    """ We re-raise database-specific data errors as HyperdbValueError
+        Note that we re-use the savepoint so that at most one savepoint
+        is used.
+    """
+
+    def filter(self, *args, **kw):
+        self.db.sql('savepoint sp')
+        try:
+            return rdbms_common.Class.filter(self, *args, **kw)
+        except psycopg2.errors.DataError as err:
+            self.db.sql('rollback to savepoint sp')
+            raise hyperdb.HyperdbValueError(str (err).split('\n')[0])
+
+    def filter_iter(self, *args, **kw):
+        self.db.sql('savepoint sp')
+        try:
+            return rdbms_common.Class.filter_iter(self, *args, **kw)
+        except psycopg2.errors.DataError as err:
+            self.db.sql('rollback to savepoint sp')
+            raise hyperdb.HyperdbValueError(str (err).split('\n')[0])
+
+    def is_retired(self, nodeid):
+        self.db.sql('savepoint sp')
+        try:
+            return rdbms_common.Class.is_retired(self, nodeid)
+        except psycopg2.errors.DataError as err:
+            self.db.sql('rollback to savepoint sp')
+            raise hyperdb.HyperdbValueError (str (err).split('\n')[0])
 
 
 class IssueClass(PostgresqlClass, rdbms_common.IssueClass):

roundup/backends/rdbms_common.py

@@ -2248,8 +2248,15 @@ def restore(self, nodeid):
         self.fireReactors('restore', nodeid, None)
 
     def is_retired(self, nodeid):
-        """Return true if the node is rerired
+        """Return true if the node is retired
         """
+        # Do not produce invalid sql, the id must be numeric
+        try:
+            id = int(nodeid)
+        except ValueError:
+            raise hyperdb.HyperdbValueError(_(
+                'class %(cls)s: %(value)r is not an id')
+                % {'cls': self.classname, 'value': nodeid})
         sql = 'select __retired__ from _%s where id=%s' % (self.classname,
                                                            self.db.arg)
         self.db.sql(sql, (nodeid,))

roundup/cgi/templating.py

@@ -1122,7 +1122,7 @@ def __getitem__(self, item):
         try:
             if int(self._nodeid) > 0:
                 value = self._klass.get(self._nodeid, items[0], None)
-        except ValueError:
+        except (IndexError, ValueError):
             value = self._nodeid
         if value is None:
             if isinstance(prop, hyperdb.Multilink):
@@ -2573,9 +2573,9 @@ def field(self, showid=0, size=None, **kwargs):
             if k and num_re.match(self._value):
                 try:
                     value = linkcl.get(self._value, k)
-                except IndexError:
+                except (IndexError, hyperdb.HyperdbValueError) as err:
                     if idparse:
-                        raise
+                        self._client.add_error_message(str(err))
                     value = ''
             else:
                 value = self._value
@@ -2880,7 +2880,10 @@ def field(self, size=30, showid=0, **kwargs):
                 showid = 1
             if not showid:
                 k = linkcl.labelprop(1)
-                value = lookupKeys(linkcl, k, value)
+                try:
+                    value = lookupKeys(linkcl, k, value)
+                except (ValueError, IndexError) as err:
+                    self._client.add_error_message (str(err))
             value = ','.join(value)
             kwargs["value"] = value