Merge branch 'bugs-bak' into bugs

igrybkov · igrybkov · commit 3a8d8b2b174a · 2015-07-11T17:27:57.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/Builder/Query/MatchTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/Builder/Query/MatchTest.php
@@ -29,7 +29,7 @@ protected function setUp()
      */
     public function testBuildQuery($conditionType, $expectedSuffix)
     {
-        $conditionPattern = "(MATCH (data_index) AGAINST ('%ssomeValue*' IN BOOLEAN MODE) * %s) AS score";
+        $conditionPattern = "(MATCH (data_index) AGAINST ('%ssomeValue*' IN BOOLEAN MODE) * POW(2, %s)) AS score";
         $expectedScoreCondition = sprintf($conditionPattern, $expectedSuffix, ScoreBuilder::WEIGHT_FIELD);
         $expectedSql = "SELECT `someTable`.* FROM `someTable` WHERE (MATCH (data_index) " .
             "AGAINST ('{$expectedSuffix}someValue*' IN BOOLEAN MODE))";

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected function setUp()`
`29`	`29`	`*/`
`30`	`30`	`public function testBuildQuery($conditionType, $expectedSuffix)`
`31`	`31`	`{`
`32`		`- $conditionPattern = "(MATCH (data_index) AGAINST ('%ssomeValue' IN BOOLEAN MODE) %s) AS score";`
	`32`	`+ $conditionPattern = "(MATCH (data_index) AGAINST ('%ssomeValue' IN BOOLEAN MODE) POW(2, %s)) AS score";`
`33`	`33`	`$expectedScoreCondition = sprintf($conditionPattern, $expectedSuffix, ScoreBuilder::WEIGHT_FIELD);`
`34`	`34`	$expectedSql = "SELECT `someTable`.* FROM `someTable` WHERE (MATCH (data_index) " .
`35`	`35`	`"AGAINST ('{$expectedSuffix}someValue*' IN BOOLEAN MODE))";`