Skip to content

Commit 8671cfa

Browse files
committed
fixup! [FIX] pg/remove_column: clean filters
1 parent b3e11b4 commit 8671cfa

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/util/fields.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,11 @@ def adapter(leaf, is_or, negated):
376376
remove_field(cr, inh.model, fieldname, cascade=cascade, drop_column=drop_column, skip_inherit=skip_inherit)
377377

378378

379+
def unstore_field(cr, model, field):
380+
remove_column(cr, table_of_model(cr, model), field)
381+
_remove_field_from_filters(cr, model, field)
382+
383+
379384
def remove_field_metadata(cr, model, fieldname, skip_inherit=()):
380385
"""
381386
Remove metadata of a field.

src/util/pg.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -604,13 +604,6 @@ def remove_column(cr, table, column, cascade=False):
604604
drop_cascade = " CASCADE" if cascade else ""
605605
cr.execute('ALTER TABLE "{0}" DROP COLUMN "{1}"{2}'.format(table, column, drop_cascade))
606606

607-
model = model_of_table(cr, table)
608-
cr.execute("SELECT 1 FROM ir_model_fields WHERE name = %s AND model = %s", [column, model])
609-
if cr.rowcount:
610-
from .fields import _remove_field_from_filters
611-
612-
_remove_field_from_filters(cr, model, column)
613-
614607

615608
def alter_column_type(cr, table, column, type, using=None, where=None, logger=_logger):
616609
# remove the existing linked `ir_model_fields_selection` recods in case it was a selection field

0 commit comments

Comments
 (0)