Merge remote-tracking branch 'remotes/dev/1.10' into 1.10

Author: rgrebenchuk

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", "id"})})
+ * @ORM\Table(name="orocrm_account", indexes={@ORM\Index(name="account_name_idx", columns={"name"})})
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable
  * @Config(

src/OroCRM/Bundle/AccountBundle/Migrations/Schema/OroCRMAccountBundleInstaller.php

@@ -80,7 +80,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_11_1';
+        return 'v1_11';
     }
 
     /**
@@ -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', 'id'], 'account_name_idx', []);
+        $table->addIndex(['name'], 'account_name_idx', []);
 
         $queries->addPostQuery(new AccountNameExprIndexQuery());
     }

src/OroCRM/Bundle/AccountBundle/Migrations/Schema/v1_11_1/UpdateIndexes.php

@@ -153,6 +153,7 @@ public function getCampaignsByCloseRevenueQB($opportunitiesAlias)
             ->join('OroCRMSalesBundle:Lead', 'lead', 'WITH', 'lead.campaign = campaign')
             ->join('lead.opportunities', $opportunitiesAlias)
             ->where(sprintf('%s.status=\'won\'', $opportunitiesAlias))
+            ->andWhere(sprintf('%s.closeRevenue>0', $opportunitiesAlias))
             ->orderBy('closeRevenue', 'DESC')
             ->groupBy('campaign.name');
 

src/OroCRM/Bundle/CampaignBundle/Entity/Repository/CampaignRepository.php

@@ -20,8 +20,7 @@
 /**
  * @ORM\Entity
  * @ORM\Table(
- *      name="orocrm_case",
- *      indexes={@ORM\Index(name="case_reported_at_idx",columns={"reportedAt", "id"})}
+ *      name="orocrm_case"
  * )
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable

src/OroCRM/Bundle/CaseBundle/Entity/CaseEntity.php

@@ -42,7 +42,7 @@ class OroCRMCaseBundleInstaller implements
      */
     public function getMigrationVersion()
     {
-        return 'v1_10';
+        return 'v1_9';
     }
 
     /**
@@ -138,7 +138,6 @@ 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', []);
     }
 
     /**

src/OroCRM/Bundle/CaseBundle/Migrations/Schema/OroCRMCaseBundleInstaller.php

@@ -33,7 +33,7 @@
  * @ORM\Table(
  *      name="orocrm_contact",
  *      indexes={
- *          @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name", "id"}),
+ *          @ORM\Index(name="contact_name_idx",columns={"last_name", "first_name"}),
  *          @ORM\Index(name="contact_updated_at_idx",columns={"updatedAt"}),
  *      }
  * )

src/OroCRM/Bundle/CaseBundle/Migrations/Schema/v1_10/UpdateIndexes.php

@@ -73,7 +73,7 @@ public function setAttachmentExtension(AttachmentExtension $attachmentExtension)
      */
     public function getMigrationVersion()
     {
-        return 'v1_15';
+        return 'v1_14';
     }
 
     /**
@@ -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', 'id'], 'contact_name_idx', []);
+        $table->addIndex(['last_name', 'first_name'], 'contact_name_idx', []);
         $table->addIndex(['updatedAt'], 'contact_updated_at_idx', []);
     }