* Fix format json

* add GetRaw()

Author: isublimity

README.md

@@ -610,6 +610,11 @@ MIT
 
 ChangeLog
 ---------
+### 2017-12-28
+
+* Fix `FORMAT JSON` if set FORMAT in sql
+* GetRaw() - result raw response if not json ``SELECT number as format_id FROM system.numbers LIMIT 3 FORMAT CSVWithNames``
+
 ### 2017-12-22
 
 * progressFunction()

src/Query/Query.php

@@ -46,15 +46,48 @@ public function setFormat($format)
         $this->format = $format;
     }
 
+
+    private function applyFormatQuery()
+    {
+        // FORMAT\s(\w)*$
+        if (null === $this->format) return false;
+        $supportFormats=
+            "FORMAT\\s+TSV|FORMAT\\s+TSVRaw|FORMAT\\s+TSVWithNames|FORMAT\\s+TSVWithNamesAndTypes|FORMAT\\s+Vertical|FORMAT\\s+JSONCompact|FORMAT\\s+JSONEachRow|FORMAT\\s+TSKV|FORMAT\\s+TabSeparatedWithNames|FORMAT\\s+TabSeparatedWithNamesAndTypes|FORMAT\\s+TabSeparatedRaw|FORMAT\\s+BlockTabSeparated|FORMAT\\s+CSVWithNames|FORMAT\\s+CSV|FORMAT\\s+JSON|FORMAT\\s+TabSeparated";
+
+        $matches=[];
+        if (preg_match_all('%('.$supportFormats.')%ius',$this->sql,$matches)){
+
+            // skip add "format json"
+            if (isset($matches[0]))
+            {
+                $format=trim(str_ireplace('format','',$matches[0][0]));
+                $this->format=$format;
+
+            }
+        }
+        else {
+            $this->sql = $this->sql . ' FORMAT ' . $this->format;
+        }
+
+
+
+
+
+
+    }
+    public function getFormat()
+    {
+
+        return $this->format;
+    }
+
     /**
      * @return string
      */
     public function toSql()
     {
         if (null !== $this->format) {
-            if (stripos($this->sql, 'FORMAT') < 1) {
-                $this->sql = $this->sql . ' FORMAT ' . $this->format;
-            }
+            $this->applyFormatQuery();
         }
 
         if (sizeof($this->degenerations))

src/Statement.php

@@ -71,11 +71,6 @@ class Statement
      */
     private $rows_before_limit_at_least = false;
 
-    /**
-     * @var
-     */
-    private $rawResult;
-
     /**
      * @var array
      */
@@ -94,6 +89,7 @@ class Statement
     public function __construct(Request $request)
     {
         $this->_request = $request;
+        $this->format = $this->_request->getRequestExtendedInfo('format');
         $this->query = $this->_request->getRequestExtendedInfo('query');
         $this->sql = $this->_request->getRequestExtendedInfo('sql');
     }
@@ -214,7 +210,7 @@ private function init()
         $this->check();
 
 
-        $this->_rawData = $this->response()->json();
+        $this->_rawData = $this->response()->rawDataOrJson($this->format);
 
         if (!$this->_rawData) {
             $this->_init = true;
@@ -368,7 +364,7 @@ public function rawData()
 
         $this->check();
 
-        return $this->response()->json();
+        return $this->response()->rawDataOrJson($this->format);
     }
     /**
      * @param bool $key
@@ -446,6 +442,15 @@ public function info()
         ];
     }
 
+    /**
+     * get format in sql
+     * @return mixed
+     */
+    public function getFormat()
+    {
+        return $this->format;
+    }
+
     /**
      * @return array
      */

src/Transport/CurlerResponse.php

@@ -287,4 +287,17 @@ public function json($key = null)
 
         return $d[$key];
     }
+
+    /**
+     * @return mixed
+     */
+    public function rawDataOrJson($format)
+    {
+        if (stripos($format,'json')!==false)
+        {
+            return $this->json();
+        }
+        return $this->body();
+
+    }
 }

src/Transport/Http.php

@@ -214,7 +214,8 @@ private function makeRequest(Query $query, $urlParams = [], $query_as_string = f
 
         $extendinfo = [
             'sql' => $sql,
-            'query' => $query
+            'query' => $query,
+            'format'=> $query->getFormat()
         ];
 
         $new = $this->newRequest($extendinfo);
@@ -249,7 +250,8 @@ public function writeStreamData($sql)
 
         $extendinfo = [
             'sql' => $sql,
-            'query' => $query
+            'query' => $query,
+            'format'=> $query->getFormat()
         ];
 
         $request = $this->newRequest($extendinfo);
@@ -274,7 +276,8 @@ public function writeAsyncCSV($sql, $file_name)
 
         $extendinfo = [
             'sql' => $sql,
-            'query' => $query
+            'query' => $query,
+            'format'=> $query->getFormat()
         ];
 
         $request = $this->newRequest($extendinfo);

tests/00_FormatTest.php

@@ -0,0 +1,96 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class ClientTest
+ */
+class FormatQueryTest extends TestCase
+{
+    /**
+     * @var \ClickHouseDB\Client
+     */
+    private $db;
+
+    /**
+     * @var
+     */
+    private $tmp_path;
+
+    /**
+     * @throws Exception
+     */
+    public function setUp()
+    {
+        date_default_timezone_set('Europe/Moscow');
+
+        if (!defined('phpunit_clickhouse_host')) {
+            throw new Exception("Not set phpunit_clickhouse_host in phpUnit.xml");
+        }
+
+        $tmp_path = rtrim(phpunit_clickhouse_tmp_path, '/') . '/';
+
+        if (!is_dir($tmp_path)) {
+            throw  new Exception("Not dir in phpunit_clickhouse_tmp_path");
+        }
+
+        $this->tmp_path = $tmp_path;
+
+        $config = [
+            'host' => phpunit_clickhouse_host,
+            'port' => phpunit_clickhouse_port,
+            'username' => phpunit_clickhouse_user,
+            'password' => phpunit_clickhouse_pass,
+
+        ];
+
+        $this->db = new ClickHouseDB\Client($config);
+
+
+        $this->db->ping();
+    }
+
+    /**
+     *
+     */
+    public function tearDown()
+    {
+        //
+    }
+
+
+
+    public function testCreateTableTEMPORARYNoSession()
+    {
+        $this->setUp();
+
+
+
+        $query="SELECT 2*number as FORMAT FROM system.numbers LIMIT 1,1 format TSV";
+        $st = $this->db->select($query);
+        $this->assertEquals($query, $st->sql());
+        $this->assertEquals('TSV', $st->getFormat());
+        $this->assertEquals("2\n", $st->rawData());
+
+
+
+        $query="SELECT number as format_id FROM system.numbers LIMIT 3 FORMAT CSVWithNames";
+        $st = $this->db->select($query);
+        $this->assertEquals($query, $st->sql());
+        $this->assertEquals('CSVWithNames', $st->getFormat());
+        $this->assertEquals("\"format_id\"\n0\n1\n2\n", $st->rawData());
+
+
+
+        $query="SELECT number as format_id FROM system.numbers LIMIT 1,1 FORMAT CSV";
+        $st = $this->db->select($query);
+        $this->assertEquals($query, $st->sql());
+        $this->assertEquals('CSV', $st->getFormat());
+
+        //
+
+
+    }
+
+
+}