From 0de3f616df7a3b78aeefb52e4799c2f9da2994ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 4 Aug 2009 16:59:47 +0200 Subject: [PATCH] Process remove action if field is in any module --- trytond/backend/postgresql/table.py | 6 ++++-- trytond/backend/sqlite/table.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/trytond/backend/postgresql/table.py b/trytond/backend/postgresql/table.py index 06f4753ec1..c10c5fa16f 100644 --- a/trytond/backend/postgresql/table.py +++ b/trytond/backend/postgresql/table.py @@ -286,7 +286,8 @@ class TableHandler(TableHandlerInterface): self._update_definitions() elif action == 'remove': if len(column_name) == 1: - if self._field2module.get(column_name[0]) != self.module_name: + if self._field2module.get(column_name[0], self.module_name) \ + != self.module_name: return if index_name in self._indexes: @@ -322,7 +323,8 @@ class TableHandler(TableHandlerInterface): elif action == 'remove': if not self._columns[column_name]['notnull']: return - if self._field2module.get(column_name) != self.module_name: + if self._field2module.get(column_name, self.module_name) \ + != self.module_name: return self.cursor.execute('ALTER TABLE "%s" ' \ 'ALTER COLUMN "%s" DROP NOT NULL' % diff --git a/trytond/backend/sqlite/table.py b/trytond/backend/sqlite/table.py index e1cca47846..089ad1de37 100644 --- a/trytond/backend/sqlite/table.py +++ b/trytond/backend/sqlite/table.py @@ -199,7 +199,8 @@ class TableHandler(TableHandlerInterface): self._update_definitions() elif action == 'remove': if len(column_name) == 1: - if self._field2module.get(column_name[0]) != self.module_name: + if self._field2module.get(column_name[0], self.module_name) \ + != self.module_name: return if index_name in self._indexes: