From fece76e15792626643281dee8d83e57d2ad6874a Mon Sep 17 00:00:00 2001
From: Yancharuk Alexander <alex@itvault.info>
Date: Mon, 1 Jul 2019 14:15:45 +0300
Subject: [PATCH 1/2] fix: Implement ability to bind values for arrays

Implement binding for Connection::PARAM_INT_ARRAY and Connection::PARAM_STR_ARRAY types
---
 README.md                   | 16 ++++++++++++++++
 src/ClickHouseStatement.php |  9 +++++++++
 tests/SelectTest.php        | 22 ++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/README.md b/README.md
index 6304a45..bb44990 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,22 @@ while ($row = $stmt->fetch()) {
 }
 ```
 
+### Select using placeholders with arrays as values
+```php
+$stmt = $conn->prepare('SELECT authorId FROM articles WHERE categoryId IN (:categoryIds)');
+
+$stmt->bindValue('categoryIds', [123, 124], \Doctrine\DBAL\Connection::PARAM_INT_ARRAY);
+$stmt->execute();
+$result = $stmt->fetchAll();
+```
+```php
+$stmt = $conn->prepare('SELECT authorId FROM articles WHERE categoryName IN (:categoryNames)');
+
+$stmt->bindValue('categoryNames', ['Auto', 'News'], \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
+$stmt->execute();
+$result = $stmt->fetchAll();
+```
+
 ### Additional types
 
 If you want to use [Array(T) type](https://clickhouse.yandex/reference_en.html#Array(T)), register additional DBAL types in your code:
diff --git a/src/ClickHouseStatement.php b/src/ClickHouseStatement.php
index 9587257..7343d63 100644
--- a/src/ClickHouseStatement.php
+++ b/src/ClickHouseStatement.php
@@ -15,6 +15,7 @@
 namespace FOD\DBALClickHouse;
 
 use ClickHouseDB\Client;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\ParameterType;
@@ -387,6 +388,14 @@ function ($value) : void {
             return (string) (int) (bool) $this->values[$key];
         }
 
+        if ($type === Connection::PARAM_INT_ARRAY) {
+            return implode(',', $this->values[$key]);
+        }
+
+        if ($type === Connection::PARAM_STR_ARRAY) {
+            return "'" . implode("','", $this->values[$key]) . "'";
+        }
+
         return $this->platform->quoteStringLiteral((string) $this->values[$key]);
     }
 }
diff --git a/tests/SelectTest.php b/tests/SelectTest.php
index 52e1dba..c50649b 100644
--- a/tests/SelectTest.php
+++ b/tests/SelectTest.php
@@ -284,5 +284,27 @@ public function testTrimChar()
 
         $this->assertEquals('t2', $stmt->fetchColumn());
     }
+
+    public function testStatementSelectWithBindingIntegersArray(): void
+    {
+        $statement = $this->connection->prepare('INSERT INTO test_select_table(id, payload) VALUES (:v0, :v1), (:v2, :v3)');
+        $statement->execute(['v0' => 11, 'v1' => 'v?11', 'v2' => 12, 'v3' => 'v12']);
+
+        $statement = $this->connection->prepare('SELECT payload from test_select_table WHERE id IN (:array) ORDER BY id');
+        $statement->bindValue('array', [11, 12], Connection::PARAM_INT_ARRAY);
+        $statement->execute();
+        $this->assertEquals([['payload' => 'v?11'], ['payload' => 'v12']], $statement->fetchAll());
+    }
+
+    public function testStatementSelectWithBindingStringsArray(): void
+    {
+        $statement = $this->connection->prepare('INSERT INTO test_select_table(id, payload) VALUES (:v0, :v1), (:v2, :v3)');
+        $statement->execute(['v0' => 13, 'v1' => 'v?13', 'v2' => 14, 'v3' => 'v14']);
+
+        $statement = $this->connection->prepare('SELECT id from test_select_table WHERE payload IN (:array) ORDER BY id');
+        $statement->bindValue('array', ['v?13', 'v14'], Connection::PARAM_STR_ARRAY);
+        $statement->execute();
+        $this->assertEquals([['id' => 13], ['id' => 14]], $statement->fetchAll());
+    }
 }
 

From d53ee0483dc3e854183cc4d4b6bc54e2a4a10731 Mon Sep 17 00:00:00 2001
From: Alexander Yancharuk <a.yancharuk@corp.mail.ru>
Date: Wed, 4 Nov 2020 13:05:55 +0300
Subject: [PATCH 2/2] chore: Fix warnings in composer.json

Deprecation warning: require.smi2/phpClickHouse is invalid, it should not contain uppercase characters. Please use smi2/phpclickhouse instead. Make sure you fix this as Composer 2.0 will error.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0c0789a..3dc816d 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "ext-PDO": "*",
         "ext-pcre": "*",
         "doctrine/dbal": "^2.7",
-        "smi2/phpClickHouse": "^1.0"
+        "smi2/phpclickhouse": "^1.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^4.0",