Handle all types of CREATE TABLE key that can have multiple columns.

Author: polevaultweb

src/PHPSQLParser/builders/ColumnListBuilder.php

@@ -63,7 +63,7 @@ protected function buildColumnReference($parsed) {
         return $builder->build($parsed);
     }
 
-    public function build(array $parsed, $delim = ' ') {
+    public function build(array $parsed, $delim = ', ') {
         if ($parsed['expr_type'] !== ExpressionType::COLUMN_LIST) {
             return '';
         }

src/PHPSQLParser/builders/CreateIndexTableBuilder.php

@@ -54,7 +54,7 @@ class CreateIndexTableBuilder implements Builder {
 
     protected function buildColumnList($parsed) {
         $builder = new ColumnListBuilder();
-        return $builder->build($parsed, ', ');
+        return $builder->build($parsed);
     }
 
     public function build(array $parsed) {

src/PHPSQLParser/builders/IndexKeyBuilder.php

@@ -70,7 +70,7 @@ protected function buildIndexType($parsed) {
 
     protected function buildColumnList($parsed) {
         $builder = new ColumnListBuilder();
-        return $builder->build($parsed, ', ');
+        return $builder->build($parsed);
     }
 
     public function build(array $parsed) {

src/PHPSQLParser/builders/RefClauseBuilder.php

@@ -84,7 +84,7 @@ protected function buildBracketExpression($parsed) {
 
     protected function buildColumnList($parsed) {
         $builder = new ColumnListBuilder();
-        return $builder->build($parsed, ',');
+        return $builder->build($parsed);
     }
 
     public function build(array $parsed) {

tests/cases/creator/issue22Test.php

@@ -43,18 +43,42 @@
 use PHPSQLParser\PHPSQLParser;
 use PHPSQLParser\PHPSQLCreator;
 
+/**
+ * https://github.com/greenlion/PHP-SQL-Parser/issues/22
+ */
 class Issue22Test extends \PHPUnit_Framework_TestCase {
 
-	/**
-	 * https://github.com/greenlion/PHP-SQL-Parser/issues/22
-	 */
-	public function testIssue22() {
-		$sql    = "CREATE TABLE IF NOT EXISTS wp_md_3_term_taxonomy (term_taxonomy_id bigint (20) NOT NULL auto_increment, term_id bigint (20) NOT NULL default 0, taxonomy varchar (32) NOT NULL default '', description longtext NOT NULL, parent bigint (20) NOT NULL default 0, count bigint (20) NOT NULL default 0, PRIMARY KEY (term_taxonomy_id), KEY term_id_taxonomy (term_id, taxonomy), KEY taxonomy (taxonomy)) DEFAULT CHARACTER SET utf8mb4";
+	protected function _test( $sql, $message ) {
 		$parser = new PHPSQLParser();
 		$parser->parse( $sql );
 		$creator = new PHPSQLCreator();
 		$created = $creator->create( $parser->parsed );
-		$this->assertSame( $sql, $created, 'Creating a CREATE statement with multi column index' );
+		$this->assertSame( $sql, $created, $message );
+	}
+
+	public function testIssue22_key() {
+		$sql    = "CREATE TABLE wp_md_3_term_taxonomy (term_taxonomy_id bigint (20) NOT NULL auto_increment, term_id bigint (20) NOT NULL default 0, taxonomy varchar (32) NOT NULL default '', description longtext NOT NULL, parent bigint (20) NOT NULL default 0, count bigint (20) NOT NULL default 0, PRIMARY KEY (term_taxonomy_id), KEY term_id_taxonomy (term_id, taxonomy), KEY taxonomy (taxonomy)) DEFAULT CHARACTER SET utf8mb4";
+		$this->_test( $sql, 'Creating a CREATE statement with multi column KEY index' );
+	}
+
+	public function testIssue22_primaryKey() {
+		$sql    = "CREATE TABLE wp_md_3_term_relationships (object_id bigint (20) NOT NULL default 0, term_taxonomy_id bigint (20) NOT NULL default 0, term_order int (11) NOT NULL default 0, PRIMARY KEY (object_id, term_taxonomy_id), KEY term_taxonomy_id (term_taxonomy_id)) DEFAULT CHARACTER SET utf8mb4";
+		$this->_test( $sql, 'Creating a CREATE statement with multi column PRIMARY KEY index' );
+	}
+
+	public function testIssue22_index() {
+		$sql    = "CREATE TABLE wp_md_3_term_relationships (object_id bigint (20) NOT NULL default 0, term_taxonomy_id bigint (20) NOT NULL default 0, term_order int (11) NOT NULL default 0, PRIMARY KEY (term_taxonomy_id), INDEX term_id_taxonomy (term_id, taxonomy)) DEFAULT CHARACTER SET utf8mb4";
+		$this->_test( $sql, 'Creating a CREATE statement with multi column INDEX' );
+	}
+
+	public function testIssue22_foreignKey() {
+		$sql = "CREATE TABLE child (col_a INT NOT NULL, col_b INT NOT NULL, FOREIGN KEY 'a_b' (col_a, col_b)) DEFAULT CHARACTER SET utf8mb4";
+		$this->_test( $sql, 'Creating a CREATE statement with multi column FOREIGN KEY' );
+	}
+
+	public function testIssue22_foreignKeyReferences() {
+		$sql = "CREATE TABLE child (col_a INT NOT NULL, col_b INT NOT NULL, FOREIGN KEY 'a_b' (col_a, col_b) REFERENCES parent (parent_a, parent_b)) DEFAULT CHARACTER SET utf8mb4";
+		$this->_test( $sql, 'Creating a CREATE statement with multi column FOREIGN KEY with multi column REFERENCES' );
 	}
 }