greenlion · Feb 24, 2024 · Feb 24, 2024 · Feb 24, 2024 · Feb 24, 2024 · Feb 24, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,23 +19,17 @@ jobs:
           - nightly
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: php-actions/composer@v6
 
       - name: PHPUnit Tests
         uses: php-actions/phpunit@master
-        env:
-          XDEBUG_MODE: coverage
         with:
-          php_extensions: "xdebug"
-          coverage_html: "coverage/html/"
-          version: 9.5
-          bootstrap: tests/bootstrap.php
           configuration: phpunit.xml
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: coverage/html
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-	"name" : "greenlion/php-sql-parser",
+	"name" : "manticoresoftware/php-sql-parser",
 	"type" : "library",
 	"description" : "A pure PHP SQL (non validating) parser w/ focus on MySQL dialect of SQL",
 	"keywords" : [

diff --git a/src/PHPSQLParser/PHPSQLCreator.php b/src/PHPSQLParser/PHPSQLCreator.php
@@ -31,15 +31,16 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * @author    André Rothe <andre.rothe@phosco.info>
  * @copyright 2010-2014 André Rothe
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
  * @version   SVN: $Id$
- * 
+ *
  */
 
 namespace PHPSQLParser;
+
 use PHPSQLParser\exceptions\UnsupportedFeatureException;
 use PHPSQLParser\builders\SelectStatementBuilder;
 use PHPSQLParser\builders\DeleteStatementBuilder;
@@ -57,85 +58,88 @@
 use PHPSQLParser\builders\AlterStatementBuilder;
 
 /**
- * This class generates SQL from the output of the PHPSQLParser. 
+ * This class generates SQL from the output of the PHPSQLParser.
  *
  * @author  André Rothe <andre.rothe@phosco.info>
  * @license http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- *  
+ *
  */
-class PHPSQLCreator {
+class PHPSQLCreator
+{
 
     public $created;
 
-    public function __construct($parsed = false) {
+    public function __construct($parsed = false)
+    {
         if ($parsed) {
             $this->create($parsed);
         }
     }
 
-    public function create($parsed) {
+    public function create($parsed)
+    {
         $k = key($parsed);
         switch ($k) {
 
-        case 'UNION':
-			$builder = new UnionStatementBuilder();
-			$this->created = $builder->build($parsed);
-			break;
-        case 'UNION ALL':
-            $builder = new UnionAllStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'SELECT':
-            $builder = new SelectStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'INSERT':
-            $builder = new InsertStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'REPLACE':
-            $builder = new ReplaceStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'DELETE':
-            $builder = new DeleteStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'TRUNCATE':
-            $builder = new TruncateStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'UPDATE':
-            $builder = new UpdateStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'RENAME':
-            $builder = new RenameStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'SHOW':
-            $builder = new ShowStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'CREATE':
-            $builder = new CreateStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'BRACKET':
-            $builder = new BracketStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'DROP':
-            $builder = new DropStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        case 'ALTER':
-            $builder = new AlterStatementBuilder();
-            $this->created = $builder->build($parsed);
-            break;
-        default:
-            throw new UnsupportedFeatureException($k);
-            break;
+            case 'UNION':
+                $builder = new UnionStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'UNION ALL':
+                $builder = new UnionAllStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'SELECT':
+                $builder = new SelectStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'INSERT':
+                $builder = new InsertStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'REPLACE':
+                $builder = new ReplaceStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'DELETE':
+                $builder = new DeleteStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'TRUNCATE':
+                $builder = new TruncateStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'UPDATE':
+                $builder = new UpdateStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'RENAME':
+                $builder = new RenameStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'SHOW':
+                $builder = new ShowStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'CREATE':
+                $builder = new CreateStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'BRACKET':
+                $builder = new BracketStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'DROP':
+                $builder = new DropStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            case 'ALTER':
+                $builder = new AlterStatementBuilder();
+                $this->created = $builder->build($parsed);
+                break;
+            default:
+                throw new UnsupportedFeatureException($k);
+                break;
         }
         return $this->created;
     }

diff --git a/src/PHPSQLParser/builders/AddBuilder.php b/src/PHPSQLParser/builders/AddBuilder.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * AliasBuilder.php
+ *
+ * Builds aliases.
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ * Copyright (c) 2010-2014 Justin Swanhart and André Rothe
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author    André Rothe <andre.rothe@phosco.info>
+ * @copyright 2010-2014 Justin Swanhart and André Rothe
+ * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
+ * @version   SVN: $Id$
+ *
+ */
+
+namespace PHPSQLParser\builders;
+
+/**
+ * This class implements the builder for aliases.
+ * You can overwrite all functions to achieve another handling.
+ *
+ * @author  André Rothe <andre.rothe@phosco.info>
+ * @license http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
+ *
+ */
+class AddBuilder implements Builder
+{
+
+    public function build(array $parsed)
+    {
+        return "ADD " . $parsed['base_expr'] . " " . $parsed['sub_tree'][0]['base_expr'];
+    }
+}
+
+?>
diff --git a/src/PHPSQLParser/builders/AlterBuilder.php b/src/PHPSQLParser/builders/AlterBuilder.php
@@ -1,35 +1,21 @@
 <?php
+
 namespace PHPSQLParser\builders;
 
+use PHPSQLParser\utils\ExpressionType;
+
 /**
  * This class implements the builder for the [DELETE] part. You can overwrite
  * all functions to achieve another handling.
  *
  * @author  André Rothe <andre.rothe@phosco.info>
  * @license http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- *  
+ *
  */
 class AlterBuilder implements Builder
 {
     public function build(array $parsed)
     {
-        $sql = '';
-
-        foreach ($parsed as $term) {
-            if ($term === ' ') {
-                continue;
-            }
-
-            if (substr($term, 0, 1) === '(' ||
-                strpos($term, "\n") !== false) {
-                $sql = rtrim($sql);
-            }
-
-            $sql .= $term . ' ';
-        }
-
-        $sql = rtrim($sql);
-
-        return $sql;
+        return "ALTER " . $parsed['base_expr'];
     }
 }
diff --git a/src/PHPSQLParser/builders/AlterStatementBuilder.php b/src/PHPSQLParser/builders/AlterStatementBuilder.php
@@ -1,24 +1,40 @@
 <?php
+
 namespace PHPSQLParser\builders;
 
 class AlterStatementBuilder implements Builder
 {
-    protected function buildSubTree($parsed) {
-        $builder = new SubTreeBuilder();
-        return $builder->build($parsed);
-    }
+
 
     private function buildAlter($parsed)
     {
         $builder = new AlterBuilder();
         return $builder->build($parsed);
     }
 
+    private function buildTable($parsed)
+    {
+        $builder = new CreateTableBuilder();
+        return $builder->build($parsed);
+    }
+
+    private function buildAdd($parsed)
+    {
+        return (new AddBuilder())->build($parsed);
+    }
+
     public function build(array $parsed)
     {
-        $alter = $parsed['ALTER'];
-        $sql = $this->buildAlter($alter);
+        $sql[] = $this->buildAlter($parsed['ALTER']);
+
+        if (isset($parsed['TABLE'])) {
+            $sql[] = $this->buildTable($parsed['TABLE']);
+        }
+
+        if (isset($parsed['ADD'])) {
+            $sql[] = $this->buildAdd($parsed['ADD']);
+        }
 
-        return $sql;
+        return implode(" ", $sql);
     }
 }