MAGETWO-66480: [GITHUB] URL key for specified store already exists #6671

- display original DB error in case conflicting URLs are not found

Author: buskamuza

app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php

@@ -121,12 +121,16 @@ protected function doReplace(array $urls)
                     $urlConflicted[$urlFound[UrlRewriteData::URL_REWRITE_ID]] = $url->toArray();
                 }
             }
-            throw new \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException(
-                __('URL key for specified store already exists.'),
-                $e,
-                $e->getCode(),
-                $urlConflicted
-            );
+            if ($urlConflicted) {
+                throw new \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException(
+                    __('URL key for specified store already exists.'),
+                    $e,
+                    $e->getCode(),
+                    $urlConflicted
+                );
+            } else {
+                throw $e->getPrevious() ?: $e;
+            }
         }
 
         return $urls;
@@ -149,7 +153,8 @@ protected function insertMultiple($data)
                 && preg_match('#SQLSTATE\[23000\]: [^:]+: 1062[^\d]#', $e->getMessage())
             ) {
                 throw new \Magento\Framework\Exception\AlreadyExistsException(
-                    __('URL key for specified store already exists.')
+                    __('URL key for specified store already exists.'),
+                    $e
                 );
             }
             throw $e;

app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php

@@ -246,7 +246,40 @@ public function testReplace()
     /**
      * @expectedException \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException
      */
-    public function testReplaceIfThrewDuplicateEntryException()
+    public function testReplaceIfThrewExceptionOnDuplicateUrl()
+    {
+        $url = $this->getMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class, [], [], '', false);
+
+        $url->expects($this->any())
+            ->method('toArray')
+            ->will($this->returnValue(['row1']));
+
+        $this->connectionMock->expects($this->once())
+            ->method('insertMultiple')
+            ->will(
+                $this->throwException(
+                    new \Exception('SQLSTATE[23000]: test: 1062 test', DbStorage::ERROR_CODE_DUPLICATE_ENTRY)
+                )
+            );
+        $conflictingUrl = [
+            UrlRewrite::URL_REWRITE_ID => 'conflicting-url'
+        ];
+        $this->connectionMock->expects($this->any())
+            ->method('fetchRow')
+            ->willReturn($conflictingUrl);
+
+        $this->storage->replace([$url]);
+    }
+
+    /**
+     * Validates a case when DB errors on duplicate entry, but calculated URLs are not really duplicated
+     *
+     * An example is when URL length exceeds length of the DB field, so URLs are trimmed and become conflicting
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage SQLSTATE[23000]: test: 1062 test
+     */
+    public function testReplaceIfThrewExceptionOnDuplicateEntry()
     {
         $url = $this->getMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class, [], [], '', false);