Merge branch 'MAGETWO-63634' of github.com:magento-troll/magento2ce into MAGETWO-58456

Author: slopukhov

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -1387,7 +1387,6 @@ protected function _removeDuplicateEntry($table, $fields, $ids)
      */
     public function select()
     {
-//        return new Select($this);
         return $this->selectFactory->create($this);
     }
 

lib/internal/Magento/Framework/DB/FieldDataConverter.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\DB;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Query\Generator;
 use Magento\Framework\DB\DataConverter\DataConverterInterface;
@@ -26,68 +27,51 @@ class FieldDataConverter
      */
     private $dataConverter;
 
+    /**
+     * @var SelectFactory
+     */
+    private $selectFactory;
+
     /**
      * Constructor
      *
      * @param Generator $queryGenerator
      * @param DataConverterInterface $dataConverter
+     * @param SelectFactory $selectFactory
      */
     public function __construct(
         Generator $queryGenerator,
-        DataConverterInterface $dataConverter
+        DataConverterInterface $dataConverter,
+        SelectFactory $selectFactory = null
     ) {
         $this->queryGenerator = $queryGenerator;
         $this->dataConverter = $dataConverter;
+        $this->selectFactory = $selectFactory ?: ObjectManager::getInstance()->get(SelectFactory::class);
     }
 
     /**
-     * Get converter select
+     * Convert table field data from one representation to another uses DataConverterInterface
      *
      * @param AdapterInterface $connection
      * @param string $table
      * @param string $identifier
      * @param string $field
      * @param QueryModifierInterface|null $queryModifier
-     *
-     * @return Select
-     *
-     * @deprecated The method will be removed in MAGETWO-63944.
+     * @return void
      */
-    public function getSelect(
+    public function convert(
         AdapterInterface $connection,
         $table,
         $identifier,
         $field,
         QueryModifierInterface $queryModifier = null
     ) {
-        $select = $connection->select()
+        $select = $this->selectFactory->create($connection)
             ->from($table, [$identifier, $field])
             ->where($field . ' IS NOT NULL');
         if ($queryModifier) {
             $queryModifier->modify($select);
         }
-
-        return $select;
-    }
-
-    /**
-     * Convert table field data from one representation to another uses DataConverterInterface
-     *
-     * @param AdapterInterface $connection
-     * @param string $table
-     * @param string $identifier
-     * @param string $field
-     * @param QueryModifierInterface|null $queryModifier
-     * @return void
-     */
-    public function convert(
-        AdapterInterface $connection,
-        $table,
-        $identifier,
-        $field,
-        QueryModifierInterface $queryModifier = null
-    ) {
-        $select = $this->getSelect($connection, $table, $identifier, $field, $queryModifier);
         $iterator = $this->queryGenerator->generate($identifier, $select);
         foreach ($iterator as $selectByRange) {
             $rows = $connection->fetchAll($selectByRange);

lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\DB\Test\Unit;
 
+use Magento\Framework\DB\SelectFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\DB\Query\Generator;
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -45,6 +46,11 @@ class FieldDataConverterTest extends \PHPUnit_Framework_TestCase
      */
     private $fieldDataConverter;
 
+    /**
+     * @var \Magento\Framework\DB\SelectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectFactoryMock;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -53,11 +59,16 @@ protected function setUp()
         $this->dataConverterMock = $this->getMock(DataConverterInterface::class);
         $this->selectMock = $this->getMock(Select::class, [], [], '', false);
         $this->queryModifierMock = $this->getMock(QueryModifierInterface::class);
+        $this->selectFactoryMock = $this->getMockBuilder(SelectFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
         $this->fieldDataConverter = $objectManager->getObject(
             FieldDataConverter::class,
             [
                 'queryGenerator' => $this->queryGeneratorMock,
-                'dataConverter' => $this->dataConverterMock
+                'dataConverter' => $this->dataConverterMock,
+                'selectFactory' => $this->selectFactoryMock
             ]
         );
     }
@@ -81,8 +92,9 @@ public function testConvert($useQueryModifier, $numQueryModifierCalls)
             ]
         ];
         $convertedValue = 'converted value';
-        $this->connectionMock->expects($this->once())
-            ->method('select')
+        $this->selectFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->connectionMock)
             ->willReturn($this->selectMock);
         $this->selectMock->expects($this->once())
             ->method('from')