Skip to content

Commit b4b3c42

Browse files
niconoe-niconoe-
committed
Fix #610 and impacted unit tests, evolving the expectations.
1 parent 7053b94 commit b4b3c42

File tree

5 files changed

+50
-56
lines changed

5 files changed

+50
-56
lines changed

‎src/Components/AlterOperation.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ class AlterOperation extends Component
146146
2,
147147
'var',
148148
],
149+
'UNIQUE' => 2,
150+
'UNIQUE KEY' => 2,
149151

150152
'CHARACTER SET' => 3,
151153
'TO' => [

‎tests/data/parser/parseAlter14.out‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -325,24 +325,22 @@
325325
"options": {
326326
"@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
327327
"options": {
328-
"1": "ADD"
328+
"1": "ADD",
329+
"2": "UNIQUE KEY"
329330
}
330331
},
331-
"field": null,
332+
"field": {
333+
"@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
334+
"database": null,
335+
"table": null,
336+
"column": "functional_index",
337+
"expr": "`functional_index`",
338+
"alias": null,
339+
"function": null,
340+
"subquery": null
341+
},
332342
"partitions": null,
333343
"unknown": [
334-
{
335-
"@type": "@10"
336-
},
337-
{
338-
"@type": "@11"
339-
},
340-
{
341-
"@type": "@12"
342-
},
343-
{
344-
"@type": "@13"
345-
},
346344
{
347345
"@type": "@14"
348346
},

‎tests/data/parser/parseAlterTableAddUniqueKey1.out‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,24 +217,22 @@
217217
"options": {
218218
"@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
219219
"options": {
220-
"1": "ADD"
220+
"1": "ADD",
221+
"2": "UNIQUE KEY"
221222
}
222223
},
223-
"field": null,
224+
"field": {
225+
"@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
226+
"database": null,
227+
"table": null,
228+
"column": "name_of_the_unique_constraint",
229+
"expr": "name_of_the_unique_constraint",
230+
"alias": null,
231+
"function": null,
232+
"subquery": null
233+
},
224234
"partitions": null,
225235
"unknown": [
226-
{
227-
"@type": "@10"
228-
},
229-
{
230-
"@type": "@11"
231-
},
232-
{
233-
"@type": "@12"
234-
},
235-
{
236-
"@type": "@13"
237-
},
238236
{
239237
"@type": "@14"
240238
},

‎tests/data/parser/parseAlterTableAddUniqueKey2.out‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,24 +217,22 @@
217217
"options": {
218218
"@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
219219
"options": {
220-
"1": "ADD"
220+
"1": "ADD",
221+
"2": "UNIQUE"
221222
}
222223
},
223-
"field": null,
224+
"field": {
225+
"@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
226+
"database": null,
227+
"table": null,
228+
"column": "name_of_the_unique_constraint",
229+
"expr": "name_of_the_unique_constraint",
230+
"alias": null,
231+
"function": null,
232+
"subquery": null
233+
},
224234
"partitions": null,
225235
"unknown": [
226-
{
227-
"@type": "@10"
228-
},
229-
{
230-
"@type": "@11"
231-
},
232-
{
233-
"@type": "@12"
234-
},
235-
{
236-
"@type": "@13"
237-
},
238236
{
239237
"@type": "@14"
240238
},

‎tests/data/parser/parsephpMyAdminExport1.out‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5401,24 +5401,22 @@
54015401
"options": {
54025402
"@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
54035403
"options": {
5404-
"1": "ADD"
5404+
"1": "ADD",
5405+
"2": "UNIQUE KEY"
54055406
}
54065407
},
5407-
"field": null,
5408+
"field": {
5409+
"@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
5410+
"database": null,
5411+
"table": null,
5412+
"column": "idServer",
5413+
"expr": "`idServer`",
5414+
"alias": null,
5415+
"function": null,
5416+
"subquery": null
5417+
},
54085418
"partitions": null,
54095419
"unknown": [
5410-
{
5411-
"@type": "@394"
5412-
},
5413-
{
5414-
"@type": "@395"
5415-
},
5416-
{
5417-
"@type": "@396"
5418-
},
5419-
{
5420-
"@type": "@397"
5421-
},
54225420
{
54235421
"@type": "@398"
54245422
},

0 commit comments

Comments
 (0)