[EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit 4e032c3c7e5c · 2018-03-26T13:51:33.000+03:00
- merged latest code from mainline branch
diff --git a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
@@ -65,7 +65,7 @@ public function __toString()
         }
         return sprintf(
             'TRIM(%s)',
-            $this->adapter->getConcatSql($columns, ' ')
+            $this->adapter->getConcatSql($columns, $this->separator)
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __toString()`
`65`	`65`	`}`
`66`	`66`	`return sprintf(`
`67`	`67`	`'TRIM(%s)',`
`68`		`- $this->adapter->getConcatSql($columns, ' ')`
	`68`	`+ $this->adapter->getConcatSql($columns, $this->separator)`
`69`	`69`	`);`
`70`	`70`	`}`
`71`	`71`	`}`