[MIG] stock_picking_group_by_base: Migration to 18.0

stock_picking_group_by_base/README.rst

@@ -85,6 +85,7 @@ Contributors
 ------------
 
 - Denis Roussel <[email protected]>
+- Tuan Nguyen <[email protected]>
 
 Maintainers
 -----------

stock_picking_group_by_base/__init__.py

@@ -1 +1,2 @@
 from . import models
+from .hooks import uninstall_hook

stock_picking_group_by_base/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Stock Picking Group By Base",
     "summary": """
         Allows to define a way to create index on extensible domain""",
-    "version": "16.0.1.0.1",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-workflow",

stock_picking_group_by_base/hooks.py

@@ -3,9 +3,11 @@
 from psycopg2.extensions import AsIs
 
 
-def uninstall_hook(cr, registry):
+def uninstall_hook(env):
     """
     This method will remove created index
     """
     index_name = "stock_picking_groupby_key_index"
-    cr.execute("DROP INDEX IF EXISTS %(index_name)s", dict(index_name=AsIs(index_name)))
+    env.cr.execute(
+        "DROP INDEX IF EXISTS %(index_name)s", dict(index_name=AsIs(index_name))
+    )

stock_picking_group_by_base/models/stock_picking.py

@@ -5,9 +5,9 @@
 import logging
 
 from psycopg2.errors import LockNotAvailable
-from psycopg2.extensions import AsIs
 
 from odoo import api, models
+from odoo.tools import SQL
 
 _logger = logging.getLogger(__name__)
 
@@ -32,7 +32,10 @@ def _get_index_for_grouping_fields(self):
     def _get_index_for_grouping_condition(self):
         return """
             WHERE printed is False
-            AND state in ('draft', 'confirmed', 'waiting', 'partially_available', 'assigned')
+            AND state in (
+                'draft', 'confirmed', 'waiting',
+                'partially_available', 'assigned'
+            )
         """
 
     @api.model
@@ -43,30 +46,38 @@ def _create_index_for_grouping(self):
 
         try:
             self.env.cr.execute(
-                "DROP INDEX IF EXISTS %(index_name)s", dict(index_name=AsIs(index_name))
+                SQL(
+                    "DROP INDEX IF EXISTS %(index_name)s",
+                    index_name=SQL.identifier(index_name),
+                )
             )
 
             self.env.cr.execute(
-                """
+                SQL(
+                    """
                     CREATE INDEX %(index_name)s
-                    ON %(table_name)s %(fields)s
+                    ON %(table_name)s (%(fields)s)
                     %(where)s
                 """,
-                dict(
-                    index_name=AsIs(index_name),
-                    table_name=AsIs(self._table),
-                    fields=tuple(
-                        [AsIs(field) for field in self._get_index_for_grouping_fields()]
+                    index_name=SQL.identifier(index_name),
+                    table_name=SQL.identifier(self._table),
+                    fields=SQL(", ").join(
+                        [
+                            SQL.identifier(field)
+                            for field in self._get_index_for_grouping_fields()
+                        ]
                     ),
-                    where=AsIs(self._get_index_for_grouping_condition()),
-                ),
+                    where=SQL(self._get_index_for_grouping_condition()),
+                )
             )
         except LockNotAvailable as e:
             # Do nothing and let module load
             _logger.warning(
-                "Impossible to create index in stock_picking_group_by_base module"
-                " due to DB Lock problem (%s)",
-                e,
+                self.env._(
+                    "Impossible to create index in stock_picking_group_by_base module"
+                    " due to DB Lock problem (%s)",
+                    e,
+                )
             )
         except Exception:
             raise

stock_picking_group_by_base/readme/CONTRIBUTORS.md

@@ -1 +1,2 @@
 - Denis Roussel \<<[email protected]>\>
+- Tuan Nguyen \<<[email protected]>\>

stock_picking_group_by_base/static/description/index.html

@@ -430,6 +430,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Denis Roussel &lt;<a class="reference external" href="mailto:denis.roussel&#64;acsone.eu">denis.roussel&#64;acsone.eu</a>&gt;</li>
+<li>Tuan Nguyen &lt;<a class="reference external" href="mailto:tuanna&#64;trobz.com">tuanna&#64;trobz.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

stock_picking_group_by_base/tests/test_groupby_index.py

@@ -2,12 +2,13 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo.tests.common import TransactionCase
+from odoo.tools import SQL
 
 
 class TestPickingGroupBy(TransactionCase):
     def test_index(self):
         index_name = "stock_picking_groupby_key_index"
         self.env.cr.execute(
-            "SELECT indexname FROM pg_indexes WHERE indexname = %s", (index_name,)
+            SQL("SELECT indexname FROM pg_indexes WHERE indexname = %s", (index_name,))
         )
         self.assertTrue(self.env.cr.fetchone())