Merge branch 'develop' into bump-version-1.1.5

Author: prateek-karanpuria-adobe

patches.json

@@ -394,6 +394,9 @@
     },
     "Fixes the issue where the file generated after Requisition List export is not removed from the var/ directory": {
       ">=1.3.1 <1.3.6": "MCLOUD-11623__requisition_list_exports_saved_to_var_directory__2.4.5-p1.patch"
+    },
+    "Fixes the issue where an SQL syntax error occurs due to the non-existence of the REGEXP_LIKE function when attempting to update the company_structure table.": {
+      "1.5.2": "MCLOUD-13605__B2B_SQL_syntax_error_due_to_the_REGEXP_LIKE_function__1.5.2.patch"
     }
   },
   "magento/magento2-ee-base": {

patches/MCLOUD-13605__B2B_SQL_syntax_error_due_to_the_REGEXP_LIKE_function__1.5.2.patch

@@ -0,0 +1,14 @@
+diff --git a/vendor/magento/module-company/Setup/Patch/Data/SetCompanyForStructure.php b/vendor/magento/module-company/Setup/Patch/Data/SetCompanyForStructure.php
+index 4dcb3dbcb5b3..7ba339a8703e 100644
+--- a/vendor/magento/module-company/Setup/Patch/Data/SetCompanyForStructure.php
++++ b/vendor/magento/module-company/Setup/Patch/Data/SetCompanyForStructure.php
+@@ -71,7 +71,7 @@ public function apply()
+                     $this->moduleDataSetup->getConnection()->update(
+                         $this->moduleDataSetup->getTable('company_structure'),
+                         ['company_id' => $company['entity_id']],
+-                        ['REGEXP_LIKE(path, ?)' =>
++                        ['path REGEXP ?' =>
+                             '^' . $adminStructureIds[$company['super_user_id']]['structure_id'] . '(/.+)?$']
+                     );
+                 }
+