Merge pull request #7564 from kenjis/fix-qb-upsertBatch

kenjis · web-flow · commit c60340611ba5 · 2023-06-14T07:32:26.000+09:00
fix: [QueryBuilder] incorrect SQL without space before "ON DUPLICATE KEY UPDATE"
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1997,7 +1997,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
         }
 
         if (isset($this->QBOptions['setQueryAsData'])) {
-            $data = $this->QBOptions['setQueryAsData'];
+            $data = $this->QBOptions['setQueryAsData'] . "\n";
         } else {
             $data = 'VALUES ' . implode(', ', $this->formatValues($values)) . "\n";
         }

Original file line number	Diff line number	Diff line change
`@@ -1997,7 +1997,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri`
`1997`	`1997`	`}`
`1998`	`1998`
`1999`	`1999`	`if (isset($this->QBOptions['setQueryAsData'])) {`
`2000`		`- $data = $this->QBOptions['setQueryAsData'];`
	`2000`	`+ $data = $this->QBOptions['setQueryAsData'] . "\n";`
`2001`	`2001`	`} else {`
`2002`	`2002`	`$data = 'VALUES ' . implode(', ', $this->formatValues($values)) . "\n";`
`2003`	`2003`	`}`