BAP-13382: Unpredictable data sorting on Calls grid (#6791)

vsoroka · yurio · commit 84f640ef19ea · 2017-01-20T15:50:02.000+02:00
- Fix issues in ORDER BY modification and move it to AST walker
- Fix indexes (add ID to the end)
diff --git a/src/OroCRM/Bundle/AccountBundle/Entity/Account.php b/src/OroCRM/Bundle/AccountBundle/Entity/Account.php
@@ -21,7 +21,7 @@
 
 /**
  * @ORM\Entity()
- * @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name"})})
+ * @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name", "id"})})
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable
  * @Config(
diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php
@@ -80,7 +80,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_11';
+        return 'v1_11_1';
     }
 
     /**
@@ -157,7 +157,7 @@ protected function createOrocrmAccountTable(Schema $schema, QueryBag $queries)
         $table->addIndex(['user_owner_id'], 'IDX_7166D3719EB185F9', []);
         $table->addIndex(['organization_id'], 'IDX_7166D37132C8A3DE', []);
         $table->addIndex(['default_contact_id'], 'IDX_7166D371AF827129', []);
-        $table->addIndex(['name'], 'account_name_idx', []);
+        $table->addIndex(['name', 'id'], 'account_name_idx', []);
 
         $queries->addPostQuery(new AccountNameExprIndexQuery());
     }
diff --git a/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_11_1/UpdateIndexes.php b/src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_11_1/UpdateIndexes.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace OroCRM\Bundle\AccountBundle\Migrations\Schema\v1_11_1;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class UpdateIndexes implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('orocrm_account');
+        $indexName = 'account_name_idx';
+        $indexColumns = ['name', 'id'];
+        if ($table->hasIndex($indexName) && $table->getIndex($indexName)->getColumns() !== $indexColumns) {
+            $table->dropIndex($indexName);
+            $table->addIndex($indexColumns, $indexName);
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/CaseBundle/Entity/CaseEntity.php b/src/OroCRM/Bundle/CaseBundle/Entity/CaseEntity.php
@@ -20,7 +20,8 @@
 /**
  * @ORM\Entity
  * @ORM\Table(
- *      name="orocrm_case"
+ *      name="orocrm_case",
+ *      indexes={@ORM\Index(name="case_reported_at_idx",columns={"reportedAt", "id"})}
  * )
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable
diff --git a/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/OroCRMCaseBundleInstaller.php b/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/OroCRMCaseBundleInstaller.php
@@ -42,7 +42,7 @@ class OroCRMCaseBundleInstaller implements
      */
     public function getMigrationVersion()
     {
-        return 'v1_9';
+        return 'v1_10';
     }
 
     /**
@@ -138,6 +138,7 @@ protected function createOrocrmCaseTable(Schema $schema)
         $table->addIndex(['related_account_id'], 'IDX_AB3BAC1E11A6570A', []);
         $table->addIndex(['source_name'], 'IDX_AB3BAC1E5FA9FB05', []);
         $table->addIndex(['priority_name'], 'IDX_AB3BAC1E965BD3DF', []);
+        $table->addIndex(['reportedAt', 'id'], 'case_reported_at_idx', []);
     }
 
     /**
diff --git a/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/v1_10/UpdateIndexes.php b/src/OroCRM/Bundle/CaseBundle/Migrations/Schema/v1_10/UpdateIndexes.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace OroCRM\Bundle\CaseBundle\Migrations\Schema\v1_10;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class UpdateIndexes implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('orocrm_case');
+        $indexName = 'case_reported_at_idx';
+        $indexColumns = ['reportedAt', 'id'];
+        if ($table->hasIndex($indexName)) {
+            if ($table->getIndex($indexName)->getColumns() !== $indexColumns) {
+                $table->dropIndex($indexName);
+                $table->addIndex($indexColumns, $indexName);
+            }
+        } else {
+            $table->addIndex($indexColumns, $indexName);
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/ContactBundle/Entity/Contact.php b/src/OroCRM/Bundle/ContactBundle/Entity/Contact.php
@@ -33,7 +33,7 @@
  * @ORM\Table(
  *      name="orocrm_contact",
  *      indexes={
- *          @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name"}),
+ *          @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name", "id"}),
  *          @ORM\Index(name="contact_updated_at_idx",columns={"updatedAt"}),
  *      }
  * )
diff --git a/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/OroCRMContactBundleInstaller.php b/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/OroCRMContactBundleInstaller.php
@@ -73,7 +73,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_14';
+        return 'v1_15';
     }
 
     /**
@@ -151,7 +151,7 @@ protected function createOrocrmContactTable(Schema $schema)
         $table->addIndex(['reports_to_contact_id'], 'IDX_403263EDF27EBC1E', []);
         $table->addIndex(['created_by_user_id'], 'IDX_403263ED7D182D95', []);
         $table->addIndex(['updated_by_user_id'], 'IDX_403263ED2793CC5E', []);
-        $table->addIndex(['last_name', 'first_name'], 'contact_name_idx', []);
+        $table->addIndex(['last_name', 'first_name', 'id'], 'contact_name_idx', []);
         $table->addIndex(['updatedAt'], 'contact_updated_at_idx', []);
     }
 
diff --git a/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/v1_15/UpdateIndexes.php b/src/OroCRM/Bundle/ContactBundle/Migrations/Schema/v1_15/UpdateIndexes.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace OroCRM\Bundle\ContactBundle\Migrations\Schema\v1_15;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class UpdateIndexes implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('orocrm_contact');
+        $indexName = 'contact_name_idx';
+        $indexColumns = ['last_name', 'first_name', 'id'];
+        if ($table->hasIndex($indexName) && $table->getIndex($indexName)->getColumns() !== $indexColumns) {
+            $table->dropIndex($indexName);
+            $table->addIndex($indexColumns, $indexName);
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/ContactUsBundle/Entity/ContactRequest.php b/src/OroCRM/Bundle/ContactUsBundle/Entity/ContactRequest.php
@@ -22,7 +22,7 @@
  * @ORM\Entity
  * @ORM\Table(
  *      name="orocrm_contactus_request",
- *      indexes={@ORM\Index(name="request_create_idx",columns={"created_at"})}
+ *      indexes={@ORM\Index(name="request_create_idx",columns={"created_at", "id"})}
  * )
  *
  * @Config(
diff --git a/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/OroCRMContactUsBundleInstaller.php b/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/OroCRMContactUsBundleInstaller.php
@@ -34,7 +34,7 @@ public function setActivityExtension(ActivityExtension $activityExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_10';
+        return 'v1_10_1';
     }
 
     /**
@@ -117,7 +117,7 @@ protected function createOrocrmContactusRequestTable(Schema $schema)
         $table->addIndex(['opportunity_id'], 'IDX_342872E89A34590F', []);
         $table->addIndex(['lead_id'], 'IDX_342872E855458D', []);
         $table->addIndex(['workflow_step_id'], 'IDX_342872E871FE882C', []);
-        $table->addIndex(['created_at'], 'request_create_idx', []);
+        $table->addIndex(['created_at', 'id'], 'request_create_idx', []);
     }
 
     
diff --git a/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/v1_10_1/UpdateIndexes.php b/src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/v1_10_1/UpdateIndexes.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace OroCRM\Bundle\ContactUsBundle\Migrations\Schema\v1_10_1;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class UpdateIndexes implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('orocrm_contactus_request');
+        $indexName = 'request_create_idx';
+        $indexColumns = ['created_at', 'id'];
+        if ($table->hasIndex($indexName) && $table->getIndex($indexName)->getColumns() !== $indexColumns) {
+            $table->dropIndex($indexName);
+            $table->addIndex($indexColumns, $indexName);
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Cart.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Cart.php
@@ -30,7 +30,7 @@
  * @ORM\Table(name="orocrm_magento_cart",
  *  indexes={
  *      @ORM\Index(name="magecart_origin_idx", columns={"origin_id"}),
- *      @ORM\Index(name="magecart_updated_idx", columns={"updatedAt"}),
+ *      @ORM\Index(name="magecart_updated_idx", columns={"updatedAt", "id"}),
  *      @ORM\Index(name="magecart_payment_details_idx", columns={"payment_details"}),
  *      @ORM\Index(name="status_name_items_qty_idx", columns={"status_name", "items_qty"})
  *  },
diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Customer.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Customer.php
@@ -35,7 +35,7 @@
  *      uniqueConstraints={@ORM\UniqueConstraint(name="magecustomer_oid_cid_unq", columns={"origin_id", "channel_id"})},
  *      indexes={
  *          @ORM\Index(name="magecustomer_name_idx",columns={"first_name", "last_name"}),
- *          @ORM\Index(name="magecustomer_rev_name_idx",columns={"last_name", "first_name"}),
+ *          @ORM\Index(name="magecustomer_rev_name_idx",columns={"last_name", "first_name", "id"}),
  *          @ORM\Index(name="magecustomer_email_guest_idx",columns={"email"})
  *      }
  * )
diff --git a/src/OroCRM/Bundle/MagentoBundle/Entity/Order.php b/src/OroCRM/Bundle/MagentoBundle/Entity/Order.php
@@ -12,8 +12,6 @@
 use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\AddressBundle\Entity\AddressType;
 use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress;
-use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem;
-use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep;
 use Oro\Bundle\LocaleBundle\Model\FirstNameInterface;
 use Oro\Bundle\LocaleBundle\Model\LastNameInterface;
 
@@ -28,7 +26,7 @@
  * @ORM\HasLifecycleCallbacks
  * @ORM\Table(name="orocrm_magento_order",
  *     indexes={
- *          @ORM\Index(name="mageorder_created_idx",columns={"created_at"})
+ *          @ORM\Index(name="mageorder_created_idx",columns={"created_at", "id"})
  *     },
  *     uniqueConstraints={
  *          @ORM\UniqueConstraint(name="unq_increment_id_channel_id", columns={"increment_id", "channel_id"})
diff --git a/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/OroCRMMagentoBundleInstaller.php b/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/OroCRMMagentoBundleInstaller.php
@@ -110,7 +110,7 @@ public function setVisitEventAssociationExtension(VisitEventAssociationExtension
      */
     public function getMigrationVersion()
     {
-        return 'v1_41_4';
+        return 'v1_41_5';
     }
 
     /**
@@ -336,7 +336,7 @@ protected function createOrocrmMagentoOrderTable(Schema $schema)
         $table->addIndex(['data_channel_id'], 'IDX_4D09F305BDC09B73', []);
         $table->addIndex(['organization_id'], 'IDX_4D09F30532C8A3DE', []);
         $table->setPrimaryKey(['id']);
-        $table->addIndex(['created_at'], 'mageorder_created_idx', []);
+        $table->addIndex(['created_at', 'id'], 'mageorder_created_idx', []);
         $table->addUniqueIndex(['increment_id', 'channel_id'], 'unq_increment_id_channel_id');
     }
 
@@ -427,7 +427,7 @@ protected function createOrocrmMagentoCustomerTable(Schema $schema)
         $table->addIndex(['organization_id'], 'IDX_2A61EE7D32C8A3DE', []);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['first_name', 'last_name'], 'magecustomer_name_idx', []);
-        $table->addIndex(['last_name', 'first_name'], 'magecustomer_rev_name_idx', []);
+        $table->addIndex(['last_name', 'first_name', 'id'], 'magecustomer_rev_name_idx', []);
         $table->addIndex(['email'], 'magecustomer_email_guest_idx', []);
         $table->addUniqueIndex(['origin_id', 'channel_id'], 'magecustomer_oid_cid_unq');
     }
@@ -714,7 +714,7 @@ protected function createOrocrmMagentoCartTable(Schema $schema)
         $table->addIndex(['organization_id'], 'IDX_96661A8032C8A3DE', []);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['origin_id'], 'magecart_origin_idx', []);
-        $table->addIndex(['updatedAt'], 'magecart_updated_idx', []);
+        $table->addIndex(['updatedAt', 'id'], 'magecart_updated_idx', []);
         $table->addIndex(['payment_details'], 'magecart_payment_details_idx', []);
         $table->addIndex(['status_name', 'items_qty'], 'status_name_items_qty_idx', []);
         $table->addUniqueIndex(['origin_id', 'channel_id'], 'unq_cart_origin_id_channel_id');
diff --git a/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/UpdateIndexes.php b/src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_5/UpdateIndexes.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace OroCRM\Bundle\MagentoBundle\Migrations\Schema\v1_41_5;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class UpdateIndexes implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('orocrm_magento_cart');
+        $indexName = 'magecart_updated_idx';
+        $indexColumns = ['updatedAt', 'id'];
+        if ($table->hasIndex($indexName) && $table->getIndex($indexName)->getColumns() !== $indexColumns) {
+            $table->dropIndex($indexName);
+            $table->addIndex($indexColumns, $indexName);
+        }
+
+        $table = $schema->getTable('orocrm_magento_order');
+        $indexName = 'mageorder_created_idx';
+        $indexColumns = ['created_at', 'id'];
+        if ($table->hasIndex($indexName) && $table->getIndex($indexName)->getColumns() !== $indexColumns) {
+            $table->dropIndex($indexName);
+            $table->addIndex($indexColumns, $indexName);
+        }
+
+        $table = $schema->getTable('orocrm_magento_customer');
+        $indexName = 'magecustomer_rev_name_idx';
+        $indexColumns = ['last_name', 'first_name', 'id'];
+        if ($table->hasIndex($indexName) && $table->getIndex($indexName)->getColumns() !== $indexColumns) {
+            $table->dropIndex($indexName);
+            $table->addIndex($indexColumns, $indexName);
+        }
+    }
+}
diff --git a/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php b/src/OroCRM/Bundle/MagentoBundle/Tests/Functional/Controller/NewsletterSubscriberControllerTest.php
@@ -2,8 +2,6 @@
 
 namespace OroCRM\Bundle\MagentoBundle\Tests\Functional\Controller;
 
-use Doctrine\ORM\EntityManager;
-
 use Oro\Bundle\ImportExportBundle\Job\JobExecutor;
 use Oro\Bundle\ImportExportBundle\Job\JobResult;
 use OroCRM\Bundle\MagentoBundle\Entity\NewsletterSubscriber;
@@ -108,8 +106,8 @@ public function gridProvider()
                     'gridFilters' => [],
                     'assert' => [
                         'channelName' => 'Magento channel',
-                        'email' => 'subscriber@example.com',
-                        'status' => 'Subscribed',
+                        'email' => 'subscriber3@example.com',
+                        'status' => 'Unsubscribed',
                         'customerName' => 'John Doe',
                         'customerEmail' => 'test@example.com'
                     ],
@@ -124,8 +122,8 @@ public function gridProvider()
                     ],
                     'assert' => [
                         'channelName' => 'Magento channel',
-                        'email' => 'subscriber@example.com',
-                        'status' => 'Subscribed',
+                        'email' => 'subscriber3@example.com',
+                        'status' => 'Unsubscribed',
                         'customerName' => 'John Doe',
                         'customerEmail' => 'test@example.com'
                     ],
diff --git a/src/OroCRM/Bundle/SalesBundle/Entity/Lead.php b/src/OroCRM/Bundle/SalesBundle/Entity/Lead.php
@@ -32,7 +32,7 @@
  *
  * @ORM\Table(
  *      name="orocrm_sales_lead",
- *      indexes={@ORM\Index(name="lead_created_idx",columns={"createdAt"})}
+ *      indexes={@ORM\Index(name="lead_created_idx",columns={"createdAt", "id"})}
  * )
  * @ORM\Entity(repositoryClass="OroCRM\Bundle\SalesBundle\Entity\Repository\LeadRepository")
  * @ORM\HasLifecycleCallbacks()
diff --git a/src/OroCRM/Bundle/SalesBundle/Entity/Opportunity.php b/src/OroCRM/Bundle/SalesBundle/Entity/Opportunity.php
@@ -22,7 +22,7 @@
  * @ORM\Entity(repositoryClass="OroCRM\Bundle\SalesBundle\Entity\Repository\OpportunityRepository")
  * @ORM\Table(
  *      name="orocrm_sales_opportunity",
- *      indexes={@ORM\Index(name="opportunity_created_idx",columns={"created_at"})}
+ *      indexes={@ORM\Index(name="opportunity_created_idx",columns={"created_at", "id"})}
  * )
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable
diff --git a/src/OroCRM/Bundle/SalesBundle/Migrations/Schema/OroCRMSalesBundleInstaller.php b/src/OroCRM/Bundle/SalesBundle/Migrations/Schema/OroCRMSalesBundleInstaller.php
diff --git a/src/OroCRM/Bundle/SalesBundle/Migrations/Schema/v1_25_7/UpdateIndexes.php b/src/OroCRM/Bundle/SalesBundle/Migrations/Schema/v1_25_7/UpdateIndexes.php

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)`
`80`	`80`	`*/`
`81`	`81`	`public function getMigrationVersion()`
`82`	`82`	`{`
`83`		`- return 'v1_11';`
	`83`	`+ return 'v1_11_1';`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`@@ -157,7 +157,7 @@ protected function createOrocrmAccountTable(Schema $schema, QueryBag $queries)`
`157`	`157`	`$table->addIndex(['user_owner_id'], 'IDX_7166D3719EB185F9', []);`
`158`	`158`	`$table->addIndex(['organization_id'], 'IDX_7166D37132C8A3DE', []);`
`159`	`159`	`$table->addIndex(['default_contact_id'], 'IDX_7166D371AF827129', []);`
`160`		`- $table->addIndex(['name'], 'account_name_idx', []);`
	`160`	`+ $table->addIndex(['name', 'id'], 'account_name_idx', []);`
`161`	`161`
`162`	`162`	`$queries->addPostQuery(new AccountNameExprIndexQuery());`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class OroCRMCaseBundleInstaller implements`
`42`	`42`	`*/`
`43`	`43`	`public function getMigrationVersion()`
`44`	`44`	`{`
`45`		`- return 'v1_9';`
	`45`	`+ return 'v1_10';`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`@@ -138,6 +138,7 @@ protected function createOrocrmCaseTable(Schema $schema)`
`138`	`138`	`$table->addIndex(['related_account_id'], 'IDX_AB3BAC1E11A6570A', []);`
`139`	`139`	`$table->addIndex(['source_name'], 'IDX_AB3BAC1E5FA9FB05', []);`
`140`	`140`	`$table->addIndex(['priority_name'], 'IDX_AB3BAC1E965BD3DF', []);`
	`141`	`+ $table->addIndex(['reportedAt', 'id'], 'case_reported_at_idx', []);`
`141`	`142`	`}`
`142`	`143`
`143`	`144`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)`
`73`	`73`	`*/`
`74`	`74`	`public function getMigrationVersion()`
`75`	`75`	`{`
`76`		`- return 'v1_14';`
	`76`	`+ return 'v1_15';`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
`@@ -151,7 +151,7 @@ protected function createOrocrmContactTable(Schema $schema)`
`151`	`151`	`$table->addIndex(['reports_to_contact_id'], 'IDX_403263EDF27EBC1E', []);`
`152`	`152`	`$table->addIndex(['created_by_user_id'], 'IDX_403263ED7D182D95', []);`
`153`	`153`	`$table->addIndex(['updated_by_user_id'], 'IDX_403263ED2793CC5E', []);`
`154`		`- $table->addIndex(['last_name', 'first_name'], 'contact_name_idx', []);`
	`154`	`+ $table->addIndex(['last_name', 'first_name', 'id'], 'contact_name_idx', []);`
`155`	`155`	`$table->addIndex(['updatedAt'], 'contact_updated_at_idx', []);`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* @ORM\Entity`
`23`	`23`	`* @ORM\Table(`
`24`	`24`	`* name="orocrm_contactus_request",`
`25`		`- * indexes={@ORM\Index(name="request_create_idx",columns={"created_at"})}`
	`25`	`+ * indexes={@ORM\Index(name="request_create_idx",columns={"created_at", "id"})}`
`26`	`26`	`* )`
`27`	`27`	`*`
`28`	`28`	`* @Config(`