From bab7e6c3a390c43edec0956237df301a8148832e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 9 Aug 2018 20:43:51 +0200 Subject: [PATCH] Remove migration before 3.0 issue6470 review52421002 --- invoice.py | 24 ------------ sale.py | 110 ++--------------------------------------------------- stock.py | 20 ---------- 3 files changed, 3 insertions(+), 151 deletions(-) diff --git a/invoice.py b/invoice.py index cf8e8febb0..eaeb1b75cd 100644 --- a/invoice.py +++ b/invoice.py @@ -2,12 +2,10 @@ # this repository contains the full copyright notices and license terms. from itertools import chain from functools import wraps -from sql import Table from trytond.model import Workflow, fields from trytond.pool import Pool, PoolMeta from trytond.transaction import Transaction -from trytond import backend __all__ = ['Invoice', 'InvoiceLine'] @@ -111,28 +109,6 @@ class Invoice(metaclass=PoolMeta): class InvoiceLine(metaclass=PoolMeta): __name__ = 'account.invoice.line' - @classmethod - def __register__(cls, module_name): - TableHandler = backend.get('TableHandler') - cursor = Transaction().connection.cursor() - sql_table = cls.__table__() - - super(InvoiceLine, cls).__register__(module_name) - - # Migration from 2.6: remove sale_lines - rel_table_name = 'sale_line_invoice_lines_rel' - if TableHandler.table_exist(rel_table_name): - rel_table = Table(rel_table_name) - cursor.execute(*rel_table.select( - rel_table.sale_line, rel_table.invoice_line)) - for sale_line, invoice_line in cursor.fetchall(): - cursor.execute(*sql_table.update( - columns=[sql_table.origin], - values=['sale.line,%s' % sale_line], - where=sql_table.id == invoice_line)) - TableHandler.drop_table( - 'sale.line-account.invoice.line', rel_table_name) - @property def origin_name(self): pool = Pool() diff --git a/sale.py b/sale.py index 37af58fbe0..d01e77a7c8 100644 --- a/sale.py +++ b/sale.py @@ -5,16 +5,11 @@ from decimal import Decimal from itertools import groupby, chain from functools import partial -from sql import Table, Null -from sql.functions import Overlay, Position -from sql.operators import Concat - from trytond.model import Workflow, Model, ModelView, ModelSQL, fields, \ sequence_ordered from trytond.modules.company import CompanyReport from trytond.wizard import Wizard, StateAction, StateView, StateTransition, \ Button -from trytond import backend from trytond.pyson import If, Eval, Bool, PYSONEncoder from trytond.transaction import Transaction from trytond.pool import Pool @@ -297,42 +292,7 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin): @classmethod def __register__(cls, module_name): - pool = Pool() - SaleLine = pool.get('sale.line') - TableHandler = backend.get('TableHandler') - sale_line_invoice_line_table_name = 'sale_line_invoice_lines_rel' - Move = pool.get('stock.move') - cursor = Transaction().connection.cursor() - model_data = Table('ir_model_data') - model_field = Table('ir_model_field') - sql_table = cls.__table__() - - # Migration from 1.2: packing renamed into shipment - cursor.execute(*model_data.update( - columns=[model_data.fs_id], - values=[Overlay(model_data.fs_id, 'shipment', - Position('packing', model_data.fs_id), - len('packing'))], - where=model_data.fs_id.like('%packing%') - & (model_data.module == module_name))) - cursor.execute(*model_field.update( - columns=[model_field.relation], - values=[Overlay(model_field.relation, 'shipment', - Position('packing', model_field.relation), - len('packing'))], - where=model_field.relation.like('%packing%') - & (model_field.module == module_name))) - cursor.execute(*model_field.update( - columns=[model_field.name], - values=[Overlay(model_field.name, 'shipment', - Position('packing', model_field.name), - len('packing'))], - where=model_field.name.like('%packing%') - & (model_field.module == module_name))) table = cls.__table_handler__(module_name) - table.column_rename('packing_state', 'shipment_state') - table.column_rename('packing_method', 'shipment_method') - table.column_rename('packing_address', 'shipment_address') # Migration from 3.8: rename reference into number if (table.column_exist('reference') @@ -340,52 +300,14 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin): table.column_rename('reference', 'number') super(Sale, cls).__register__(module_name) - - # Migration from 1.2 - cursor.execute(*sql_table.update( - columns=[sql_table.invoice_method], - values=['shipment'], - where=sql_table.invoice_method == 'packing')) - table = cls.__table_handler__(module_name) - # Migration from 2.2 - table.not_null_action('sale_date', 'remove') - - # state confirmed splitted into confirmed and processing - if (TableHandler.table_exist(SaleLine._table) - and TableHandler.table_exist( - sale_line_invoice_line_table_name) - and TableHandler.table_exist(Move._table)): - sale_line = SaleLine.__table__() - sale_line_invoice_line = \ - Table(sale_line_invoice_line_table_name) - move = Move.__table__() - # Wrap subquery inside an other inner subquery because MySQL syntax - # doesn't allow update a table and select from the same table in a - # subquery. - sub_query = sql_table.join(sale_line, - condition=sale_line.sale == sql_table.id - ).join(sale_line_invoice_line, 'LEFT', - condition=sale_line_invoice_line.sale_line == sale_line.id - ).join(move, 'LEFT', - condition=(move.origin == Concat( - SaleLine.__name__ + ',', sale_line.id)) - ).select(sql_table.id, - where=(sql_table.state == 'confirmed') - & ((sale_line_invoice_line.id != Null) - | (move.id != Null))) - cursor.execute(*sql_table.update( - columns=[sql_table.state], - values=['processing'], - where=sql_table.id.in_(sub_query.select(sub_query.id)))) - - # Add index on create_date - table = cls.__table_handler__(module_name) - table.index_action('create_date', action='add') # Migration from 4.0: Drop not null on payment_term table.not_null_action('payment_term', 'remove') + # Add index on create_date + table.index_action('create_date', action='add') + @classmethod def default_payment_term(cls): PaymentTerm = Pool().get('account.invoice.payment_term') @@ -1137,21 +1059,9 @@ class SaleLine(sequence_ordered(), ModelSQL, ModelView): @classmethod def __register__(cls, module_name): - cursor = Transaction().connection.cursor() - sql_table = cls.__table__() super(SaleLine, cls).__register__(module_name) table = cls.__table_handler__(module_name) - # Migration from 1.0 comment change into note - if table.column_exist('comment'): - cursor.execute(*sql_table.update( - columns=[sql_table.note], - values=[sql_table.comment])) - table.drop_column('comment') - - # Migration from 2.4: drop required on sequence - table.not_null_action('sequence', action='remove') - # Migration from 4.6: drop required on description table.not_null_action('description', action='remove') @@ -1684,20 +1594,6 @@ class HandleShipmentExceptionAsk(ModelView): domain_moves = fields.Many2Many( 'stock.move', None, None, 'Domain Moves') - @classmethod - def __register__(cls, module_name): - cursor = Transaction().connection.cursor() - model = Table('ir_model') - # Migration from 1.2: packing renamed into shipment - cursor.execute(*model.update( - columns=[model.model], - values=[Overlay(model.model, 'shipment', - Position('packing', model.model), - len('packing'))], - where=model.model.like('%packing%') - & (model.module == module_name))) - super(HandleShipmentExceptionAsk, cls).__register__(module_name) - class HandleShipmentException(Wizard): 'Handle Shipment Exception' diff --git a/stock.py b/stock.py index f4b7b83c29..e2e5ab882a 100644 --- a/stock.py +++ b/stock.py @@ -2,9 +2,6 @@ # this repository contains the full copyright notices and license terms. from functools import wraps -from sql import Null -from sql.operators import Concat - from trytond.model import Workflow, ModelView, fields from trytond.transaction import Transaction from trytond.pool import Pool, PoolMeta @@ -122,23 +119,6 @@ class Move(metaclass=PoolMeta): ('recreated', 'Recreated'), ], 'Exception State'), 'get_sale_exception_state') - @classmethod - def __register__(cls, module_name): - cursor = Transaction().connection.cursor() - sql_table = cls.__table__() - - super(Move, cls).__register__(module_name) - - table = cls.__table_handler__(module_name) - - # Migration from 2.6: remove sale_line - if table.column_exist('sale_line'): - cursor.execute(*sql_table.update( - columns=[sql_table.origin], - values=[Concat('sale.line,', sql_table.sale_line)], - where=sql_table.sale_line != Null)) - table.drop_column('sale_line') - @classmethod def _get_origin(cls): models = super(Move, cls)._get_origin()