Feat(mysql): add support for the UNIQUE KEY constraint (#1708)

* Feat(mysql): add support for the UNIQUE KEY constraint

* Cleanup

sqlglot/expressions.py

@@ -1285,7 +1285,7 @@ class TitleColumnConstraint(ColumnConstraintKind):
 
 
 class UniqueColumnConstraint(ColumnConstraintKind):
-    arg_types: t.Dict[str, t.Any] = {}
+    arg_types = {"this": False}
 
 
 class UppercaseColumnConstraint(ColumnConstraintKind):
@@ -1450,10 +1450,6 @@ class PrimaryKey(Expression):
     arg_types = {"expressions": True, "options": False}
 
 
-class Unique(Expression):
-    arg_types = {"expressions": True}
-
-
 # https://www.postgresql.org/docs/9.1/sql-selectinto.html
 # https://docs.aws.amazon.com/redshift/latest/dg/r_SELECT_INTO.html#r_SELECT_INTO-examples
 class Into(Expression):

sqlglot/generator.py

@@ -629,8 +629,10 @@ def primarykeycolumnconstraint_sql(self, expression: exp.PrimaryKeyColumnConstra
             return f"PRIMARY KEY{' DESC' if desc else ' ASC'}"
         return f"PRIMARY KEY"
 
-    def uniquecolumnconstraint_sql(self, _) -> str:
-        return "UNIQUE"
+    def uniquecolumnconstraint_sql(self, expression: exp.UniqueColumnConstraint) -> str:
+        this = self.sql(expression, "this")
+        this = f" {this}" if this else ""
+        return f"UNIQUE{this}"
 
     def create_sql(self, expression: exp.Create) -> str:
         kind = self.sql(expression, "kind").upper()
@@ -1771,10 +1773,6 @@ def primarykey_sql(self, expression: exp.ForeignKey) -> str:
         options = f" {options}" if options else ""
         return f"PRIMARY KEY ({expressions}){options}"
 
-    def unique_sql(self, expression: exp.Unique) -> str:
-        columns = self.expressions(expression, key="expressions")
-        return f"UNIQUE ({columns})"
-
     def if_sql(self, expression: exp.If) -> str:
         return self.case_sql(
             exp.Case(ifs=[expression.copy()], default=expression.args.get("false"))

sqlglot/parser.py

@@ -3371,9 +3371,10 @@ def _parse_unnamed_constraint(
         return self.CONSTRAINT_PARSERS[constraint](self)
 
     def _parse_unique(self) -> exp.Expression:
-        if not self._match(TokenType.L_PAREN, advance=False):
-            return self.expression(exp.UniqueColumnConstraint)
-        return self.expression(exp.Unique, expressions=self._parse_wrapped_id_vars())
+        self._match_text_seq("KEY")
+        return self.expression(
+            exp.UniqueColumnConstraint, this=self._parse_schema(self._parse_id_var(any_token=False))
+        )
 
     def _parse_key_constraint_options(self) -> t.List[str]:
         options = []

tests/dialects/test_mysql.py

@@ -6,6 +6,10 @@ class TestMySQL(Validator):
     dialect = "mysql"
 
     def test_ddl(self):
+        self.validate_identity(
+            "INSERT INTO x VALUES (1, 'a', 2.0) ON DUPLICATE KEY UPDATE SET x.id = 1"
+        )
+
         self.validate_all(
             "CREATE TABLE z (a INT) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARACTER SET=utf8 COLLATE=utf8_bin COMMENT='x'",
             write={
@@ -21,10 +25,6 @@ def test_ddl(self):
                 "mysql": "CREATE TABLE t (c DATETIME DEFAULT CURRENT_TIMESTAMP() ON UPDATE CURRENT_TIMESTAMP()) DEFAULT CHARACTER SET=utf8 ROW_FORMAT=DYNAMIC",
             },
         )
-        self.validate_identity(
-            "INSERT INTO x VALUES (1, 'a', 2.0) ON DUPLICATE KEY UPDATE SET x.id = 1"
-        )
-
         self.validate_all(
             "CREATE TABLE x (id int not null auto_increment, primary key (id))",
             write={
@@ -37,6 +37,12 @@ def test_ddl(self):
                 "sqlite": "CREATE TABLE x (id INTEGER NOT NULL)",
             },
         )
+        self.validate_all(
+            "CREATE TABLE `foo` (`id` char(36) NOT NULL DEFAULT (uuid()), PRIMARY KEY (`id`), UNIQUE KEY `id` (`id`))",
+            write={
+                "mysql": "CREATE TABLE `foo` (`id` CHAR(36) NOT NULL DEFAULT (UUID()), PRIMARY KEY (`id`), UNIQUE `id` (`id`))",
+            },
+        )
 
     def test_identity(self):
         self.validate_identity("SELECT CURRENT_TIMESTAMP(6)")