Merge pull request #189 from antanasja/feat/post-type-bindings

Post type bindings support

Author: isublimity

src/Client.php

@@ -817,9 +817,14 @@ public function partitions(string $table, int $limit = null, bool $active = null
         return $this->select(<<<CLICKHOUSE
 SELECT *
 FROM system.parts 
-WHERE like(table,'%$table%') AND database='$database'$whereActiveClause
+WHERE table={tbl:String} AND database = {db:String}
+$whereActiveClause
 ORDER BY max_date $limitClause
-CLICKHOUSE
+CLICKHOUSE,
+            [
+                'db'=>$database,
+                'tbl'=>$table
+            ]
         )->rowsAsTree('name');
     }
 

src/Query/Degeneration.php

@@ -5,4 +5,5 @@ interface Degeneration
 {
     public function process($sql);
     public function bindParams(array $bindings);
+    public function getBind():array;
 }

src/Query/Degeneration/Bindings.php

@@ -28,6 +28,11 @@ public function bindParams(array $bindings)
         }
     }
 
+    public function getBind(): array
+    {
+        return $this->bindings;
+    }
+
     /**
      * @param string $column
      * @param mixed  $value

src/Query/Degeneration/Conditions.php

@@ -22,6 +22,10 @@ public function bindParams(array $bindings)
         }
     }
 
+    public function getBind(): array
+    {
+        return $this->bindings;
+    }
 
     static function __ifsets($matches, $markers)
     {

src/Query/Query.php

@@ -104,10 +104,36 @@ private function applyFormatQuery()
      */
     public function getFormat()
     {
-
         return $this->format;
     }
 
+    public function isUseInUrlBindingsParams():bool
+    {
+        //  'query=select {p1:UInt8} + {p2:UInt8}' -F "param_p1=3" -F "param_p2=4"
+        return preg_match('#{[\w+]+:[\w+()]+}#',$this->sql);
+
+    }
+    public function getUrlBindingsParams():array
+    {
+        $out=[];
+        if (sizeof($this->degenerations)) {
+            foreach ($this->degenerations as $degeneration) {
+                if ($degeneration instanceof Degeneration) {
+                    $params=$degeneration->getBind();
+                    break;
+                    // need first response
+                }
+            }
+        }
+        if (sizeof($params)) {
+            foreach ($params as $key=>$value)
+            {
+                $out['param_'.$key]=$value;
+            }
+        }
+        return $out;
+    }
+
     public function toSql()
     {
         if ($this->format !== null) {

src/Transport/Http.php

@@ -299,6 +299,10 @@ private function makeRequest(Query $query, array $urlParams = [], bool $query_as
          * Build URL after request making, since URL may contain auth data. This will not matter after the
          * implantation of the todo in the `HTTP:newRequest()` method.
          */
+
+        if ($query->isUseInUrlBindingsParams()) {
+            $urlParams=array_replace_recursive($query->getUrlBindingsParams());
+        }
         $url = $this->getUrl($urlParams);
         $new->url($url);
 

tests/BindingsPostTest.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace ClickHouseDB\Tests;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @group BindingsPost
+ */
+final class BindingsPostTest extends TestCase
+{
+    use WithClient;
+
+
+    public function testSelectPostParams()
+    {
+        $xpx1=time();
+        $result = $this->client->select(
+            'SELECT number+{num_num:UInt8} as numbe_r, {xpx1:UInt32} as xpx1,{zoza:String} as zoza FROM system.numbers LIMIT 6',
+            [
+                'num_num'=>123,
+                'xpx1'=>$xpx1,
+                'zoza'=>'ziza'
+            ]
+        );
+        $this->assertEquals(null,$result->fetchRow('x'));   //0
+        $this->assertEquals(null,$result->fetchRow('y'));   //1
+        $this->assertEquals($xpx1,$result->fetchRow('xpx1'));        //2
+        $this->assertEquals('ziza',$result->fetchRow('zoza'));//3
+        $this->assertEquals(127,$result->fetchRow('numbe_r')); // 123+4
+        $this->assertEquals(128,$result->fetchRow('numbe_r')); // 123+5 item
+    }
+
+    public function testSelectAsKeys()
+    {
+        // chr(0....255);
+        $this->client->settings()->set('max_block_size', 100);
+
+        $bind['k1']=1;
+        $bind['k2']=2;
+
+        $select=[];
+        for($z=0;$z<4;$z++)
+        {
+            $bind['k'.$z]=$z;
+            $select[]="{k{$z}:UInt16} as k{$z}";
+        }
+        $rows=$this->client->select("SELECT ".implode(",\n",$select),$bind)->rows();
+
+        $this->assertNotEmpty($rows);
+
+        $row=$rows[0];
+
+        for($z=10;$z<4;$z++) {
+            $this->assertArrayHasKey('k'.$z,$row);
+            $this->assertEquals($z,$row['k'.$z]);
+
+        }
+    }
+
+    public function testArrayAsPostParam()
+    {
+        $arr = [1,3,6];
+        $result = $this->client->select(
+            'SELECT {arr:Array(UInt8)} as arr',
+            [
+                'arr'=>json_encode($arr)
+            ]
+        );
+        $this->assertEquals($arr, $result->fetchRow('arr'));
+    }
+
+}

tests/ClientTest.php

@@ -715,6 +715,12 @@ public function testSelectAsync()
         $this->assertEquals(2, $state2->fetchOne('ping'));
     }
 
+    public function testPartsInfo()
+    {
+        $this->create_table_summing_url_views();
+        $this->insert_data_table_summing_url_views();
+        $this->assertIsArray($this->client->partitions('summing_url_views'));
+    }
     /**
      *
      */