Merge fcfea16 into 71476c9

Author: 2ur1st

src/Quote/StrictQuoteLine.php

@@ -88,6 +88,7 @@ public function quoteValue($row)
                 // Elements of the array - the numbers are formatted as usual, and the dates, dates-with-time, and lines are in
                 // single quotation marks with the same screening rules as above.
                 // as in the TabSeparated format, and then the resulting string is output in InsertRow in double quotes.
+                $value = $this->escapeDoubleQoutes($value);
                 $result_array = FormatLine::Insert($value);
 
                 return $encodeArray . '[' . $result_array . ']' . $encodeArray;
@@ -103,5 +104,11 @@ public function quoteValue($row)
         return array_map($quote, $row);
     }
 
+    public function escapeDoubleQoutes(array $arr)
+    {
+        return array_map(function($v) {
+            return is_string($v) ? str_replace('"', '""', $v) : $v;
+        }, $arr);
+    }
 
 }

tests/StrictQuoteLineTest.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace ClickHouseDB\Tests;
+
+use ClickHouseDB\Quote\StrictQuoteLine;
+use PHPUnit\Framework\TestCase;
+
+class StrictQuoteLineTest extends TestCase
+{
+    use WithClient;
+
+    public function setUp()
+    {
+        $this->client->write('DROP TABLE IF EXISTS cities');
+        $this->client->write('
+            CREATE TABLE IF NOT EXISTS cities (
+                date Date,
+                city String,
+                keywords Array(String),
+                nums Array(UInt8)
+            ) ENGINE = MergeTree(date, (date), 8192)
+        ');
+        parent::setUp();
+    }
+
+    /**
+     * @group test
+     */
+    public function testQuoteValueCSV()
+    {
+        $strict = new StrictQuoteLine('CSV');
+
+        $rows = [
+            ['2018-04-01', '"That works"', ['\"That does not\"', 'That works'], [8, 7]],
+            ['2018-04-02', 'That works', ['\""That does not\""', '"\'\""That works"""\"'], [1, 0]],
+            ['2018-04-03', 'That works', ['\"\"That does not"\'""', '""""That works""""'], [9, 121]],
+        ];
+        $fileName = $this->tmpPath . '__test_quote_value.csv';
+
+        @unlink($fileName);
+        foreach ($rows as $row) {
+            file_put_contents($fileName, $strict->quoteRow($row) . "\n", FILE_APPEND);
+        }
+
+        $this->client->insertBatchFiles('cities', [$fileName], ['date', 'city', 'keywords', 'nums']);
+        $statement = $this->client->select('SELECT * FROM cities');
+
+        $result = array_map('array_values', $statement->rows());
+        foreach ($result as $key => $value) {
+            // check correct quote string
+            $this->assertEmpty(array_diff($rows[$key][2], $value[2]));
+            $this->assertEmpty(array_diff($rows[$key][3], $value[3]));
+        }
+
+        $rows[0][2][1] = 'Not the same string';
+        $this->assertCount(1, array_diff($rows[0][2], $result[0][2]));
+    }
+}