From 886533e1c54fc10614a6c53f077c8363e2a64197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 3 Mar 2010 18:28:58 +0100 Subject: [PATCH 1/2] Add replace python function for old sqlite for issue1432 --- trytond/backend/sqlite/database.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/trytond/backend/sqlite/database.py b/trytond/backend/sqlite/database.py index 393170ac89..399eee9e3e 100644 --- a/trytond/backend/sqlite/database.py +++ b/trytond/backend/sqlite/database.py @@ -78,6 +78,9 @@ def date_trunc(_type, date): def split_part(text, delimiter, count): return (text.split(delimiter) + [''] * (count - 1))[count - 1] +def replace(text, pattern, replacement): + return str(text).replace(pattern, replacement) + class Database(DatabaseInterface): @@ -109,6 +112,8 @@ class Database(DatabaseInterface): self._conn.create_function('extract', 2, extract) self._conn.create_function('date_trunc', 2, date_trunc) self._conn.create_function('split_part', 3, split_part) + if sqlite.sqlite_version_info < (3, 3, 14): + self._conn.create_function('replace', 3, replace) return self def cursor(self, autocommit=False): From f535736b809a0321fa83082b39ce9a3b5510d59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 3 Mar 2010 18:37:26 +0100 Subject: [PATCH 2/2] Add test on tag when applying inherit view for issue1435 data can contain elements that are comments --- trytond/model/modelview.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py index fd4a2668b7..4f9f0e6919 100644 --- a/trytond/model/modelview.py +++ b/trytond/model/modelview.py @@ -25,6 +25,8 @@ def _inherit_apply(src, inherit): tree_inherit = etree.fromstring(inherit) root_inherit = tree_inherit.getroottree().getroot() for element2 in root_inherit: + if element2.tag != 'xpath': + continue element = _find(tree_src, element2) if element is not None: pos = element2.get('position', 'inside')