Skip to content

Commit f6078e8

Browse files
author
Carlos Cima
committed
Added support for primary key lengths and "IF NOT EXISTS" clause in table definition.
1 parent 98aa4ed commit f6078e8

6 files changed

Lines changed: 100 additions & 5 deletions

File tree

‎src/Model/Column.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ class Column
6464
*/
6565
private $primaryKey;
6666

67+
/**
68+
* @var int
69+
*/
70+
private $primaryKeyLength;
71+
6772
/**
6873
* @var string
6974
*/
@@ -286,6 +291,22 @@ public function setPrimaryKey($primaryKey)
286291
$this->primaryKey = $primaryKey;
287292
}
288293

294+
/**
295+
* @return int
296+
*/
297+
public function getPrimaryKeyLength()
298+
{
299+
return $this->primaryKeyLength;
300+
}
301+
302+
/**
303+
* @param int $primaryKeyLength
304+
*/
305+
public function setPrimaryKeyLength($primaryKeyLength)
306+
{
307+
$this->primaryKeyLength = $primaryKeyLength;
308+
}
309+
289310
/**
290311
* @return string
291312
*/

‎src/Model/Table.php‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ class Table
99
*/
1010
private $name;
1111

12+
/**
13+
* @var bool
14+
*/
15+
private $ifNotExists;
16+
1217
/**
1318
* @var string
1419
*/
@@ -70,6 +75,22 @@ public function getName()
7075
return $this->name;
7176
}
7277

78+
/**
79+
* @return bool
80+
*/
81+
public function isIfNotExists()
82+
{
83+
return $this->ifNotExists;
84+
}
85+
86+
/**
87+
* @param bool $ifNotExists
88+
*/
89+
public function setIfNotExists($ifNotExists)
90+
{
91+
$this->ifNotExists = $ifNotExists;
92+
}
93+
7394
/**
7495
* @return string
7596
*/
@@ -324,7 +345,13 @@ public function generatePrimaryKeyCreationScript()
324345

325346
$primaryKeys = [];
326347
foreach ($this->primaryKeys as $primaryKeyColumn) {
327-
$primaryKeys[] = sprintf('`%s`', $primaryKeyColumn->getName());
348+
if ($primaryKeyColumn->getPrimaryKeyLength()) {
349+
$primaryKey = sprintf('`%s`(%s)', $primaryKeyColumn->getName(), $primaryKeyColumn->getPrimaryKeyLength());
350+
} else {
351+
$primaryKey = sprintf('`%s`', $primaryKeyColumn->getName());
352+
}
353+
354+
$primaryKeys[] = $primaryKey;
328355
}
329356

330357
return sprintf('PRIMARY KEY (%s)', implode(',', $primaryKeys));
@@ -369,6 +396,12 @@ public function generateCreationScript($ignoreAutoIncrement = false, $sortKeys =
369396

370397
$tableOptions = [];
371398

399+
if ($this->ifNotExists) {
400+
$ifNotExists = ' IF NOT EXISTS';
401+
} else {
402+
$ifNotExists = '';
403+
}
404+
372405
if ($this->engine) {
373406
$tableOptions[] = sprintf('ENGINE=%s', $this->engine);
374407
}
@@ -387,6 +420,6 @@ public function generateCreationScript($ignoreAutoIncrement = false, $sortKeys =
387420
$implodedTableOptions = ' ' . $implodedTableOptions;
388421
}
389422

390-
return trim(sprintf('CREATE TABLE `%s` (%s %s%s)%s;', $this->name, PHP_EOL, implode(',' . PHP_EOL . ' ', $tableDefinitions), PHP_EOL, $implodedTableOptions));
423+
return trim(sprintf('CREATE TABLE%s `%s` (%s %s%s)%s;', $ifNotExists, $this->name, PHP_EOL, implode(',' . PHP_EOL . ' ', $tableDefinitions), PHP_EOL, $implodedTableOptions));
391424
}
392425
}

‎src/Parser.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function parseTables($sqlScript)
4343
$tables = [];
4444
for ($i = 0; $i < count($matches[0]); $i++) {
4545
$name = $matches['tableName'][$i];
46+
$ifNotExists = $matches['ifNotExists'][$i];
4647
$definition = $matches['tableDefinition'][$i];
4748
$creationScript = $matches['creationScript'][$i];
4849
$engine = $matches['engine'][$i];
@@ -53,6 +54,10 @@ public function parseTables($sqlScript)
5354
$table->setDefinition(trim($definition));
5455
$table->setCreationScript(trim($creationScript) . ';');
5556

57+
if ($ifNotExists) {
58+
$table->setIfNotExists(true);
59+
}
60+
5661
if ($engine) {
5762
$table->setEngine($engine);
5863
}
@@ -171,8 +176,20 @@ public function parsePrimaryKey(Table $table)
171176
$primaryKeyNames = explode(',', str_replace('`', '', $matches['primaryKey']));
172177

173178
foreach ($primaryKeyNames as $primaryKeyName) {
174-
$primaryKeyColumn = $table->getColumnByName(trim($primaryKeyName));
179+
if (preg_match('/^(?<columnName>[^\(]+)\((?<keyLength>\d+)\)/', $primaryKeyName, $keyMatches)) {
180+
$columnName = $keyMatches['columnName'];
181+
$keyLength = $keyMatches['keyLength'];
182+
} else {
183+
$columnName = $primaryKeyName;
184+
$keyLength = null;
185+
}
186+
$primaryKeyColumn = $table->getColumnByName(trim($columnName));
175187
$primaryKeyColumn->setPrimaryKey(true);
188+
189+
if ($keyLength) {
190+
$primaryKeyColumn->setPrimaryKeyLength($keyLength);
191+
}
192+
176193
$table->addPrimaryKey($primaryKeyColumn);
177194
}
178195
}

‎src/RegExpPattern.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RegExpPattern
3131
*/
3232
public static function tables()
3333
{
34-
$pattern = '/(?<creationScript>CREATE\s+TABLE\s+`(?<tableName>\S+)`\s+';
34+
$pattern = '/(?<creationScript>CREATE\s+TABLE\s+(?<ifNotExists>IF NOT EXISTS)?\s*`(?<tableName>\S+)`\s+';
3535
$pattern .= '\((?<tableDefinition>[^;\/]+)\)';
3636
$pattern .= '(?:\s+ENGINE=(?<engine>[^;\s]+))?\s*';
3737
$pattern .= '(?:AUTO_INCREMENT=(?<autoIncrement>\d+))?\s*';
@@ -77,7 +77,7 @@ public static function dataType()
7777
*/
7878
public static function primaryKey()
7979
{
80-
return '/PRIMARY KEY \((?<primaryKey>.+?)\)/';
80+
return '/PRIMARY KEY \((?<primaryKey>(?:`[^`]+`\s*(?:\(\d+\))?,?)+)\)/';
8181
}
8282

8383
/**

‎tests/ParserTest.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,4 +286,20 @@ public function testIsParsingDoubleUnsignedType()
286286
$this->assertEquals('double unsigned', $database->getTableByName('jos_finder_links')->getColumnByName('list_price')->getColumnType());
287287
$this->assertEquals('double', $database->getTableByName('jos_finder_links')->getColumnByName('list_price')->getDataType());
288288
}
289+
290+
public function testIsParsingPrimaryKeyLength()
291+
{
292+
$creationScript = $this->getDatabaseFixture('jos_extwebdav_properties.sql');
293+
294+
$parser = new Parser();
295+
296+
$database = $parser->parseDatabase($creationScript);
297+
298+
$this->assertInstanceOf(Database::class, $database);
299+
$this->assertCount(1, $database->getTables());
300+
$this->assertCount(4, $database->getTableByName('jos_extwebdav_properties')->getColumns());
301+
$this->assertCount(3, $database->getTableByName('jos_extwebdav_properties')->getPrimaryKeys());
302+
303+
$this->assertEquals($creationScript, $database->getTableByName('jos_extwebdav_properties')->generateCreationScript());
304+
}
289305
}

‎tests/fixtures/jos_extwebdav_properties.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CREATE TABLE IF NOT EXISTS `jos_extwebdav_properties` (
2+
`path` varchar(255) NOT NULL DEFAULT '',
3+
`name` varchar(120) NOT NULL DEFAULT '',
4+
`ns` varchar(120) NOT NULL DEFAULT 'DAV:',
5+
`value` text,
6+
PRIMARY KEY (`ns`(100),`path`(100),`name`(50)),
7+
KEY `path` (`path`)
8+
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

0 commit comments

Comments
 (0)