Merge remote-tracking branch 'remotes/barmi/master'

Author: osapon

composer.json

@@ -9,6 +9,10 @@
       "name": "Carlos Cima",
       "role": "Developer"
     },
+    {
+      "name": "barmi",
+      "role": "Developer"
+    },
     {
       "name": "osapon",
       "role": "Developer"

src/Model/Column.php

@@ -77,6 +77,8 @@ class Column
      */
     private $defaultValue;
 
+    private $virtual;
+
     /**
      * @var string
      */
@@ -110,6 +112,16 @@ public function __construct($name)
         $this->name = $name;
     }
 
+    public function setVirtual($virtual)
+    {
+        $this->virtual = $virtual;
+    }
+
+    public function getVirtual($virtual)
+    {
+        return $this->virtual;
+    }
+
     /**
      * @return string
      */
@@ -435,6 +447,10 @@ public function generateCreationScript()
             $columnOptions[] = sprintf('DEFAULT %s', $this->defaultValue);
         }
 
+        if (!empty($this->virtual)) {
+            $columnOptions[] = sprintf('GENERATED ALWAYS AS (%s) VIRTUAL', $this->virtual);
+        }
+
         if (!empty($this->onUpdateValue)) {
             $columnOptions[] = sprintf('ON UPDATE %s', $this->onUpdateValue);
         }

src/Parser.php

@@ -23,6 +23,10 @@ public function parseDatabase($sqlScript)
     {
         $database = new Database();
 
+        // skshin for remove PARTITION
+        $sqlScript = preg_replace('/[\(]*PARTITION.*/', ';', $sqlScript);
+        //$sqlScript = preg_replace('/(\s|\()*PARTITION.*ENGINE = .*$/', '', $sqlScript);
+
         $tables = $this->parseTables($this->convertStringsToBase64($sqlScript));
 
         foreach ($tables as $table) {
@@ -137,6 +141,7 @@ public function parseColumns(Table $table)
             $nullable = $matches['nullable'][$i];
             $autoIncrement = $matches['autoIncrement'][$i];
             $defaultValue = $matches['defaultValue'][$i];
+            $virtual = $matches['virtual'][$i];
             $onUpdateValue = $matches['onUpdateValue'][$i];
             $comment = $matches['comment'][$i];
             $characterSet = $matches['characterSet'][$i];
@@ -156,6 +161,10 @@ public function parseColumns(Table $table)
             $column->setNullable($nullable !== 'NOT NULL');
             $column->setAutoIncrement(!empty($autoIncrement));
 
+            if (!empty($virtual)) {
+                $column->setVirtual($virtual);
+            }
+
             if (!empty($defaultValue)) {
                 $column->setDefaultValue($defaultValue);
             }

src/RegExpPattern.php

@@ -27,6 +27,7 @@ class RegExpPattern
         '(?:tiny|medium|long)?blob',
         'enum\(.+\)',
         'set\(.+\)',
+        'json',
     ];
 
     /**
@@ -35,7 +36,7 @@ class RegExpPattern
     public static function tables()
     {
         $pattern = '/(?<creationScript>CREATE\s+TABLE\s+(?<ifNotExists>IF NOT EXISTS)?\s*`(?<tableName>\S+)`\s+';
-        $pattern .= '\((?<tableDefinition>[^\/]+?)\)';
+        $pattern .= '\((?<tableDefinition>.+?)\)';
         $pattern .= '(';
         $pattern .= '(?:\s+ENGINE\s*=\s*(?<engine>[^;\s]+))?\s*';
         $pattern .= '|';
@@ -73,6 +74,7 @@ public static function column()
         $pattern .= '(?<nullable>NULL|NOT NULL)?\s*';
         $pattern .= '(?<autoIncrement>AUTO_INCREMENT)?\s*';
         $pattern .= '(?:DEFAULT (?<defaultValue>\S+|\'[^\']+\'))?\s*';
+        $pattern .= '(?:GENERATED ALWAYS AS \((?<virtual>.+)\) VIRTUAL)?\s*';
         $pattern .= '(?:ON UPDATE (?<onUpdateValue>\S+))?\s*';
         $pattern .= '(?:COMMENT \'(?<comment>([^\']|\'\')+)\')?\s*';
         $pattern .= '(?:,|$)/';
@@ -125,8 +127,9 @@ public static function index()
         $pattern .= '(?<fullText>FULLTEXT)?\s*';
         $pattern .= 'KEY\s+`(?<name>\S+?)`\s+';
         $pattern .= '\((?<columns>(?:`[^`]+`(?:\(\d+\))?,?)+)\)\s*';
-        $pattern .= '(?<options>[^,]+?)?\s*';
-        $pattern .= '(?:,|$)/';
+        $pattern .= '(?<options>[^(\)|,)]+?)?\s*';
+        //$pattern .= '(?:,|$)/';
+        $pattern .= '/';
         $pattern .= 'i'; // modifier
 
         return $pattern;