Skip to content

Commit 5b1036a

Browse files
committed
Use a comma for the multi column index delimiter when creating CREATE table statements.
Fixes #22
1 parent d43cd12 commit 5b1036a

2 files changed

Lines changed: 61 additions & 1 deletion

File tree

src/PHPSQLParser/builders/IndexKeyBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected function buildIndexType($parsed) {
7070

7171
protected function buildColumnList($parsed) {
7272
$builder = new ColumnListBuilder();
73-
return $builder->build($parsed);
73+
return $builder->build($parsed, ', ');
7474
}
7575

7676
public function build(array $parsed) {
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?php
2+
/**
3+
* issue22Test.php
4+
*
5+
* Test case for PHPSQLCreator.
6+
*
7+
* PHP version 5
8+
*
9+
* LICENSE:
10+
* Copyright (c) 2010-2014 Justin Swanhart and André Rothe
11+
* All rights reserved.
12+
*
13+
* Redistribution and use in source and binary forms, with or without
14+
* modification, are permitted provided that the following conditions
15+
* are met:
16+
* 1. Redistributions of source code must retain the above copyright
17+
* notice, this list of conditions and the following disclaimer.
18+
* 2. Redistributions in binary form must reproduce the above copyright
19+
* notice, this list of conditions and the following disclaimer in the
20+
* documentation and/or other materials provided with the distribution.
21+
* 3. The name of the author may not be used to endorse or promote products
22+
* derived from this software without specific prior written permission.
23+
*
24+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
25+
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26+
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27+
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
28+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
29+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33+
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
*
35+
* @author André Rothe <andre.rothe@phosco.info>
36+
* @copyright 2010-2014 Justin Swanhart and André Rothe
37+
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
38+
* @version SVN: $Id$
39+
*
40+
*/
41+
namespace PHPSQLParser\Test\Creator;
42+
43+
use PHPSQLParser\PHPSQLParser;
44+
use PHPSQLParser\PHPSQLCreator;
45+
46+
class Issue22Test extends \PHPUnit_Framework_TestCase {
47+
48+
/**
49+
* https://github.com/greenlion/PHP-SQL-Parser/issues/22
50+
*/
51+
public function testIssue22() {
52+
$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";
53+
$parser = new PHPSQLParser();
54+
$parser->parse( $sql );
55+
$creator = new PHPSQLCreator();
56+
$created = $creator->create( $parser->parsed );
57+
$this->assertSame( $sql, $created, 'Creating a CREATE statement with multi column index' );
58+
}
59+
}
60+

0 commit comments

Comments
 (0)