Skip to content

Commit ad3113e

Browse files
author
Andrew Svirin
committed
Add handling of command SHOW FULL COLUMNS FOR {table_name}
Handling multiple databases for create queries, then sql is CREATE TABLE `database`.`table` and in same script is `information_schema`.`table` Fixing PDO::getAttribute() missing method
1 parent a0005ec commit ad3113e

File tree

7 files changed

+236
-10
lines changed

7 files changed

+236
-10
lines changed

‎src/FakePdoStatementTrait.php‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,18 @@ public function universalExecute(?array $params = null)
137137
$create_queries = (new Parser\CreateTableParser())->parse($sql);
138138

139139
foreach ($create_queries as $create_query) {
140+
if (strpos($create_query->name, '.')) {
141+
list($databaseName, $tableName) = explode('.', $create_query->name, 2);
142+
} else {
143+
$databaseName = $this->conn->getDatabaseName();
144+
$tableName = $create_query->name;
145+
}
140146
$this->conn->getServer()->addTableDefinition(
141-
$this->conn->getDatabaseName(),
142-
$create_query->name,
147+
$databaseName,
148+
$tableName,
143149
Processor\CreateProcessor::makeTableDefinition(
144150
$create_query,
145-
$this->conn->getDatabaseName()
151+
$databaseName
146152
)
147153
);
148154
}
@@ -284,6 +290,17 @@ function ($row) {
284290
);
285291
break;
286292

293+
case Query\ShowColumnsQuery::class:
294+
$this->result = self::processResult(
295+
$this->conn,
296+
Processor\ShowColumnsProcessor::process(
297+
$this->conn,
298+
new Processor\Scope(array_merge($params ?? [], $this->boundValues)),
299+
$parsed_query
300+
)
301+
);
302+
break;
303+
287304
default:
288305
throw new \UnexpectedValueException('Unsupported operation type ' . $sql);
289306
}

‎src/FakePdoTrait.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@ public function setAttribute($key, $value)
8787
return true;
8888
}
8989

90+
public function getAttribute($key)
91+
{
92+
switch ($key) {
93+
case \PDO::ATTR_CASE:
94+
$value = $this->lowercaseResultKeys ? \PDO::CASE_LOWER : \PDO::CASE_UPPER;
95+
}
96+
97+
return $value;
98+
}
99+
90100
public function getServer() : Server
91101
{
92102
return $this->server;

‎src/Parser/CreateTableParser.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,13 @@ private static function parseCreateTable(array $tokens, string $sql) : CreateQue
218218
\array_shift($tokens);
219219
}
220220

221-
$t = \array_shift($tokens);
221+
// Extract [{database}.]{table}
222+
if ($tokens[1] === '.') {
223+
$t = \array_shift($tokens) . \array_shift($tokens) . \array_shift($tokens);
224+
} else {
225+
$t = \array_shift($tokens);
226+
}
227+
222228
$name = static::decodeIdentifier($t);
223229

224230
if (static::nextTokenIs($tokens, 'LIKE')) {

‎src/Parser/SQLParser.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
InsertQuery,
1010
UpdateQuery,
1111
DropTableQuery,
12-
ShowTablesQuery};
12+
ShowTablesQuery,
13+
ShowColumnsQuery
14+
};
1315

1416
final class SQLParser
1517
{
@@ -141,11 +143,11 @@ final class SQLParser
141143
'TABLES' => true,
142144
];
143145

144-
/** @var array<SelectQuery|InsertQuery|UpdateQuery|TruncateQuery|DeleteQuery|DropTableQuery|ShowTablesQuery|ShowIndexQuery> */
146+
/** @var array<SelectQuery|InsertQuery|UpdateQuery|TruncateQuery|DeleteQuery|DropTableQuery|ShowTablesQuery|ShowIndexQuery|ShowColumnsQuery> */
145147
private static $cache = [];
146148

147149
/**
148-
* @return SelectQuery|InsertQuery|UpdateQuery|TruncateQuery|DeleteQuery|DropTableQuery|ShowTablesQuery|ShowIndexQuery
150+
* @return SelectQuery|InsertQuery|UpdateQuery|TruncateQuery|DeleteQuery|DropTableQuery|ShowTablesQuery|ShowIndexQuery|ShowColumnsQuery
149151
*/
150152
public static function parse(string $sql)
151153
{
@@ -157,7 +159,7 @@ public static function parse(string $sql)
157159
}
158160

159161
/**
160-
* @return SelectQuery|InsertQuery|UpdateQuery|TruncateQuery|DeleteQuery|DropTableQuery|ShowTablesQuery|ShowIndexQuery
162+
* @return SelectQuery|InsertQuery|UpdateQuery|TruncateQuery|DeleteQuery|DropTableQuery|ShowTablesQuery|ShowIndexQuery|ShowColumnsQuery
161163
*/
162164
private static function parseImpl(string $sql)
163165
{

‎src/Parser/ShowParser.php‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
namespace Vimeo\MysqlEngine\Parser;
44

5+
use Vimeo\MysqlEngine\Query\ShowColumnsQuery;
56
use Vimeo\MysqlEngine\Query\ShowIndexQuery;
6-
use Vimeo\MysqlEngine\TokenType;
77
use Vimeo\MysqlEngine\Query\ShowTablesQuery;
8+
use Vimeo\MysqlEngine\TokenType;
89

910
/**
1011
* Very limited parser for SHOW TABLES LIKE 'foo'
@@ -47,13 +48,21 @@ public function parse()
4748

4849
$this->pointer++;
4950

51+
// For case with TABLES and COLUMNS could be optinaly used argument FULL.
52+
if ($this->tokens[$this->pointer]->value === 'FULL') {
53+
$isFull = true;
54+
$this->pointer++;
55+
}
56+
5057
switch ($this->tokens[$this->pointer]->value) {
5158
case 'TABLES':
5259
return $this->parseShowTables();
5360
case 'INDEX':
5461
case 'INDEXES':
5562
case 'KEYS':
5663
return $this->parseShowIndex();
64+
case 'COLUMNS':
65+
return $this->parseShowColumns($isFull ?? false);
5766
default:
5867
throw new ParserException("Parser error: expected SHOW TABLES");
5968
}
@@ -64,7 +73,7 @@ private function parseShowTables(): ShowTablesQuery
6473
$this->pointer++;
6574

6675
if ($this->tokens[$this->pointer]->value !== 'LIKE') {
67-
throw new ParserException("Parser error: expected SHOW TABLES LIKE");
76+
throw new ParserException("Parser error: expected SHOW [FULL] TABLES LIKE");
6877
}
6978

7079
$this->pointer++;
@@ -102,6 +111,38 @@ private function parseShowIndex(): ShowIndexQuery
102111
list($this->pointer, $expression) = $expression_parser->buildWithPointer();
103112
$query->whereClause = $expression;
104113
}
114+
115+
return $query;
116+
}
117+
118+
private function parseShowColumns(bool $isFull): ShowColumnsQuery
119+
{
120+
$this->pointer++;
121+
122+
if ($this->tokens[$this->pointer]->value !== 'FROM') {
123+
throw new ParserException("Parser error: expected SHOW [FULL] COLUMNS FROM");
124+
}
125+
126+
$this->pointer++;
127+
128+
$token = $this->tokens[$this->pointer];
129+
if ($token->type !== TokenType::IDENTIFIER) {
130+
throw new ParserException("Expected table name after FROM");
131+
}
132+
133+
$query = new ShowColumnsQuery($token->value, $this->sql);
134+
$query->isFull = $isFull;
135+
$this->pointer++;
136+
137+
if ($this->pointer < count($this->tokens)) {
138+
if ($this->tokens[$this->pointer]->value !== 'WHERE') {
139+
throw new ParserException("Parser error: expected SHOW [FULL] COLUMNS FROM [TABLE_NAME] WHERE");
140+
}
141+
$expression_parser = new ExpressionParser($this->tokens, $this->pointer);
142+
list($this->pointer, $expression) = $expression_parser->buildWithPointer();
143+
$query->whereClause = $expression;
144+
}
145+
105146
return $query;
106147
}
107148
}

‎src/Processor/ShowColumnsProcessor.php‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<?php
2+
3+
namespace Vimeo\MysqlEngine\Processor;
4+
5+
use Vimeo\MysqlEngine\FakePdoInterface;
6+
use Vimeo\MysqlEngine\Query\ShowColumnsQuery;
7+
use Vimeo\MysqlEngine\Query\ShowIndexQuery;
8+
use Vimeo\MysqlEngine\Schema\Column;
9+
use function PHPUnit\Framework\assertIsArray;
10+
11+
class ShowColumnsProcessor extends Processor
12+
{
13+
public static function process(
14+
FakePdoInterface $conn,
15+
Scope $scope,
16+
ShowColumnsQuery $stmt
17+
): QueryResult {
18+
[$database, $table] = Processor::parseTableName($conn, $stmt->table);
19+
$table_definition = $conn->getServer()->getTableDefinition(
20+
$database,
21+
$table
22+
);
23+
if (!$table_definition) {
24+
return new QueryResult([], []);
25+
}
26+
$columns = [
27+
'Field' => new Column\Varchar(255),
28+
'Type' => new Column\Varchar(255),
29+
'Collation' => new Column\Varchar(255),
30+
'Null' => new Column\Enum(['NO', 'YES']),
31+
'Key' => new Column\Enum(['PRI']),
32+
'Default' => new Column\Varchar(255),
33+
'Extra' => new Column\Enum(['auto_increment']),
34+
'Privilegies' => new Column\Varchar(255),
35+
'Comment' => new Column\Varchar(255),
36+
];
37+
$rows = [];
38+
foreach ($table_definition->columns as $name => $column) {
39+
$rows[] = [
40+
'Field' => $name,
41+
'Type' => self::resolveType($column),
42+
'Collation' => self::resolveCollation($column),
43+
'Null' => $column->isNullable() ? 'YES' : 'NO',
44+
'Key' => in_array($name, $table_definition->primaryKeyColumns) ? 'PRI' : '',
45+
'Default' => $column->getDefault(),
46+
'Extra' => self::resolveExtra($column),
47+
'Privilegies' => 'select,insert,update,references',
48+
'Comment' => '',
49+
];
50+
}
51+
$result = self::applyWhere($conn, $scope, $stmt->whereClause, new QueryResult($rows, $columns));
52+
53+
$rows = array_merge($result->rows);
54+
$columns = $result->columns;
55+
if (!$stmt->isFull) {
56+
$allowedColumns = [
57+
'Field',
58+
'Type',
59+
'Null',
60+
'Key',
61+
'Default',
62+
'Extra',
63+
];
64+
$columns = array_intersect_key($columns, array_flip($allowedColumns));
65+
}
66+
67+
return new QueryResult(array_merge($result->rows), $result->columns);
68+
}
69+
70+
private static function resolveType(Column $column): string
71+
{
72+
if ($column instanceof Column\Varchar) {
73+
$type = 'varchar(255)';
74+
} elseif ($column instanceof Column\IntColumn) {
75+
$type = 'int(11)';
76+
} elseif ($column instanceof Column\DateTime) {
77+
$type = 'datetime';
78+
} else {
79+
throw new \UnexpectedValueException('Column type not specified.');
80+
}
81+
82+
return $type;
83+
}
84+
85+
private static function resolveCollation(Column $column): string
86+
{
87+
if (is_subclass_of($column, Column\CharacterColumn::class)) {
88+
$collation = $column->getCollation();
89+
}
90+
91+
return $collation ?? '';
92+
}
93+
94+
private static function resolveKey(Column $column): string
95+
{
96+
97+
}
98+
99+
private static function resolveDefault(Column $column): ?string
100+
{
101+
if ($column instanceof Column\Defaultable) {
102+
$default = $column->getDefault();
103+
}
104+
105+
return $default ?? null;
106+
}
107+
108+
private static function resolveExtra(Column $column): string
109+
{
110+
if ($column instanceof Column\IntegerColumn) {
111+
$extra = $column->isAutoIncrement() ? 'auto_increment' : '';
112+
}
113+
114+
return $extra ?? '';
115+
}
116+
}

‎src/Query/ShowColumnsQuery.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
3+
namespace Vimeo\MysqlEngine\Query;
4+
5+
use Vimeo\MysqlEngine\Query\Expression\Expression;
6+
7+
final class ShowColumnsQuery
8+
{
9+
/**
10+
* @var bool
11+
*/
12+
public $isFull = false;
13+
14+
/**
15+
* @var ?Expression
16+
*/
17+
public $whereClause = null;
18+
19+
/**
20+
* @var string
21+
*/
22+
public $table;
23+
24+
/**
25+
* @var string
26+
*/
27+
public $sql;
28+
29+
public function __construct(string $table, string $sql)
30+
{
31+
$this->table = $table;
32+
$this->sql = $sql;
33+
}
34+
}

0 commit comments

Comments
 (0)