Resolve WITH-TOTAL problem

ierusalim · ierusalim · commit aff323227456 · 2018-02-22T11:23:42.000+03:00
Sometimes request WITH TOTAL rerurn unkonwn format of response
diff --git a/src/ClickHouseQuery.php b/src/ClickHouseQuery.php
@@ -504,7 +504,12 @@ public function queryArr($sql, $numeric_keys = false, $sess = null)
                     } else {
                         $s = \explode("\t", $s);
                         if (!$numeric_keys) {
-                            $s = \array_combine($keys, $s);
+                            while(\count($s) < \count($keys)) {
+                                $s[]='';
+                            }
+                            if (\count($s) == \count($keys)) {
+                                $s = \array_combine($keys, $s);
+                            }
                         }
                         $this->extra[] = $s;
                     }

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,12 @@ public function queryArr($sql, $numeric_keys = false, $sess = null)`
`504`	`504`	`} else {`
`505`	`505`	`$s = \explode("\t", $s);`
`506`	`506`	`if (!$numeric_keys) {`
`507`		`- $s = \array_combine($keys, $s);`
	`507`	`+ while(\count($s) < \count($keys)) {`
	`508`	`+ $s[]='';`
	`509`	`+ }`
	`510`	`+ if (\count($s) == \count($keys)) {`
	`511`	`+ $s = \array_combine($keys, $s);`
	`512`	`+ }`
`508`	`513`	`}`
`509`	`514`	`$this->extra[] = $s;`
`510`	`515`	`}`