isValidName added

Author: ierusalim

src/ClickHouseSQLParser.php

@@ -732,6 +732,22 @@ public function tableCreaterFnParser($sql) {
         return $ret;
     }
 
+    /**
+     * Check if the name is valid id
+     *
+     * @param string $sql
+     * @param boolean $return_name
+     * @return boolean|string
+     */
+    public function isValidName($sql, $return_name = false)
+    {
+        $idpat = "[a-z_][0-9a-z_]*";
+        $pattern = "#^(`)?(?<name>(?(1)[^`]+|$idpat))(?(1)`)$#is";
+        $matches = [];
+        $result = \preg_match($pattern, $sql, $matches);
+        return ($return_name) ? $matches['name'] : ($result == 1);
+    }
+
     /**
      * Parse last part of create-table-sql request like "ENGINE = MergeTree(...)"
      *
@@ -780,12 +796,11 @@ public function parseCreateEngineSql($create_engine)
                     break;
                 }
             }
-            if (empty($primary_key) ||
-                (\substr($primary_key, 0, 1) !=='(')  ||
-                (\substr($primary_key, -1) !==')')) {
-                    return "Primary key undefined or illegal";
+            if ((\substr($primary_key, 0, 1) ==='(')  && (\substr($primary_key, -1) ===')')) {
+                $primary_key = $this->divParts(\substr($primary_key, 1, -1));
+            } elseif ($this->isValidName($primary_key)) {
+                $primary_key = [$primary_key];
             }
-            $primary_key = $this->divParts(\substr($primary_key, 1, -1));
             if (!\is_array($primary_key) || empty($primary_key[0])) {
                 return "Can't parse primary key";
             }

tests/src/CreaterTableParserTest.php

@@ -27,6 +27,19 @@ protected function setUp()
     public function createEngineProvider()
     {
         return [
+            #0
+            ["Engine = MergeTree(a, b, 8192)",
+            ['engine' => 'MergeTree',
+             'engine_param' => ['a', 'b', 8192],
+             'merge_tree_fam' => true,
+             'date_field' => 'a',
+             'sampl' => false,
+             'primary_key' => 'b',
+             'granul' => 8192,
+             'ver' => false
+            ]],
+
+            #1
             ["ENGINE = MergeTree(dt, (id, dt), 8192, ver)",
             ['engine' => 'MergeTree',
              'engine_param' => ['dt', '(id, dt)', 8192, 'ver'],
@@ -38,6 +51,7 @@ public function createEngineProvider()
              'ver' => 'ver'
             ]],
 
+            #2
             ["ENGINE = MergeTree(dt, (id, dt), 8192)",
             ['engine' => 'MergeTree',
              'engine_param' => ['dt', '(id, dt)', 8192],
@@ -49,6 +63,7 @@ public function createEngineProvider()
              'ver' => ''
             ]],
 
+            #3
             ["ENGINE = MergeTree(dt, sampl, (id, dt), 8192)",
             ['engine' => 'MergeTree',
              'engine_param' => ['dt', 'sampl', '(id, dt)', 8192],
@@ -60,6 +75,7 @@ public function createEngineProvider()
              'ver' => ''
             ]],
 
+            #4
             ["ENGINE = Log",
             ['engine' => 'Log',
              'engine_param' => [''],
@@ -71,11 +87,14 @@ public function createEngineProvider()
              'ver' => ''
             ]],
 
+            #5
             ["ENGINE = Log(", false],
+
+            #6
             ["IMAGINE = Log", false],
-            ["Engine = MergeTree(a, b, 8192)", false],
-            ["Engine = MergeTree(a, (), 8192)", false],
 
+            #7
+            ["Engine = MergeTree(a, (), 8192)", false],
         ];
     }
 
@@ -101,6 +120,9 @@ public function testParseCreateEngineSql($sql, $regpars)
                 }
             }
         } else {
+            if (\is_array($ans)) {
+                print_r($ans);
+            }
             $this->assertFalse(\is_array($ans));
         }
     }
@@ -707,6 +729,32 @@ public function testMakeFieldCreater($name, $type, $default, $creater)
         $this->assertEquals($creater, $ans);
     }
 
+    /**
+     * Data provider for testIsValidName
+     *
+     * @return array of name, isValid, ret_name
+     */
+    public function isValidNameProvider()
+    {
+        return [
+          ['id', true, false],
+          ['id', 'id', true],
+          ['', false, false],
+        ];
+    }
+
+    /**
+     * @dataProvider isValidNameProvider
+     * @covers ierusalim\ClickHouse\ClickHouseSQLParser::isValidName
+     * @todo   Implement testMakeFieldCreater().
+     */
+    public function testIsValidName($name, $isValid, $ret_name)
+    {
+        $ch = $this->object;
+        $ans = $ch->isValidName($name, $ret_name);
+        $this->assertEquals($isValid, $ans);
+    }
+
     /**
      * Data provider for testParseCreateFields
      *