Fix #610 and impacted unit tests, evolving the expectations.

phpmyadmin · Jan 30, 2025 · b4b3c42 · b4b3c42
1 parent 7053b94
commit b4b3c42
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 56 deletions.
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -146,6 +146,8 @@ class AlterOperation extends Component
             2,
             'var',
         ],
+        'UNIQUE' => 2,
+        'UNIQUE KEY' => 2,
 
         'CHARACTER SET' => 3,
         'TO' => [

diff --git a/tests/data/parser/parseAlter14.out b/tests/data/parser/parseAlter14.out
@@ -325,24 +325,22 @@
                         "options": {
                             "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
                             "options": {
-                                "1": "ADD"
+                                "1": "ADD",
+                                "2": "UNIQUE KEY"
                             }
                         },
-                        "field": null,
+                        "field": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
+                            "database": null,
+                            "table": null,
+                            "column": "functional_index",
+                            "expr": "`functional_index`",
+                            "alias": null,
+                            "function": null,
+                            "subquery": null
+                        },
                         "partitions": null,
                         "unknown": [
-                            {
-                                "@type": "@10"
-                            },
-                            {
-                                "@type": "@11"
-                            },
-                            {
-                                "@type": "@12"
-                            },
-                            {
-                                "@type": "@13"
-                            },
                             {
                                 "@type": "@14"
                             },

diff --git a/tests/data/parser/parseAlterTableAddUniqueKey1.out b/tests/data/parser/parseAlterTableAddUniqueKey1.out
@@ -217,24 +217,22 @@
                         "options": {
                             "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
                             "options": {
-                                "1": "ADD"
+                                "1": "ADD",
+                                "2": "UNIQUE KEY"
                             }
                         },
-                        "field": null,
+                        "field": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
+                            "database": null,
+                            "table": null,
+                            "column": "name_of_the_unique_constraint",
+                            "expr": "name_of_the_unique_constraint",
+                            "alias": null,
+                            "function": null,
+                            "subquery": null
+                        },
                         "partitions": null,
                         "unknown": [
-                            {
-                                "@type": "@10"
-                            },
-                            {
-                                "@type": "@11"
-                            },
-                            {
-                                "@type": "@12"
-                            },
-                            {
-                                "@type": "@13"
-                            },
                             {
                                 "@type": "@14"
                             },

diff --git a/tests/data/parser/parseAlterTableAddUniqueKey2.out b/tests/data/parser/parseAlterTableAddUniqueKey2.out
@@ -217,24 +217,22 @@
                         "options": {
                             "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
                             "options": {
-                                "1": "ADD"
+                                "1": "ADD",
+                                "2": "UNIQUE"
                             }
                         },
-                        "field": null,
+                        "field": {
+                            "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
+                            "database": null,
+                            "table": null,
+                            "column": "name_of_the_unique_constraint",
+                            "expr": "name_of_the_unique_constraint",
+                            "alias": null,
+                            "function": null,
+                            "subquery": null
+                        },
                         "partitions": null,
                         "unknown": [
-                            {
-                                "@type": "@10"
-                            },
-                            {
-                                "@type": "@11"
-                            },
-                            {
-                                "@type": "@12"
-                            },
-                            {
-                                "@type": "@13"
-                            },
                             {
                                 "@type": "@14"
                             },

diff --git a/tests/data/parser/parsephpMyAdminExport1.out b/tests/data/parser/parsephpMyAdminExport1.out
@@ -5401,24 +5401,22 @@
                                 "options": {
                                     "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",
                                     "options": {
-                                        "1": "ADD"
+                                        "1": "ADD",
+                                        "2": "UNIQUE KEY"
                                     }
                                 },
-                                "field": null,
+                                "field": {
+                                    "@type": "PhpMyAdmin\\SqlParser\\Components\\Expression",
+                                    "database": null,
+                                    "table": null,
+                                    "column": "idServer",
+                                    "expr": "`idServer`",
+                                    "alias": null,
+                                    "function": null,
+                                    "subquery": null
+                                },
                                 "partitions": null,
                                 "unknown": [
-                                    {
-                                        "@type": "@394"
-                                    },
-                                    {
-                                        "@type": "@395"
-                                    },
-                                    {
-                                        "@type": "@396"
-                                    },
-                                    {
-                                        "@type": "@397"
-                                    },
                                     {
                                         "@type": "@398"
                                     },