BUG24946089: Fix unique key SQL generation

amitab · amitab · commit 9eb2056a8abd · 2016-10-29T16:23:49.000+05:30
This patch fixes the unique key SQL generation. UNIQUE INDEX was used
in place of UNIQUE KEY which gave rise to this error.

Modifed tests to check this.
diff --git a/lib/mysqlx/statement.py b/lib/mysqlx/statement.py
@@ -1266,7 +1266,7 @@ def _col_definition(self):
         if self._p_key:
             defn = "{0} PRIMARY KEY".format(defn)
         elif self._u_index:
-            defn = "{0} UNIQUE INDEX".format(defn)
+            defn = "{0} UNIQUE KEY".format(defn)
         if self._ref_table and self._ref_fields:
             ref_table = quote_multipart_identifier(parse_table_name(
                 self._default_schema, name))
diff --git a/tests/test_mysqlx_crud.py b/tests/test_mysqlx_crud.py
@@ -291,7 +291,7 @@ def test_create_table(self):
                 mysqlx.ColumnType.INT).unsigned().not_null().set_default(3)) \
             .add_column(mysqlx.ColumnDef('rental_rate',
                 mysqlx.ColumnType.DECIMAL, 4).decimals(2).not_null() \
-                .set_default(4.99)) \
+                .set_default(4.99).unique_index()) \
             .add_column(mysqlx.ColumnDef('length', mysqlx.ColumnType.INT) \
                 .unsigned()) \
             .add_column(mysqlx.ColumnDef('replacement_cost',
@@ -313,6 +313,9 @@ def test_create_table(self):
                 .refers_to(table_a,['language_id']).on_update('Cascade')) \
             .execute()
         self.assertTrue(film.exists_in_database())
+        self.assertEqual(1, len(self.node_session.sql('SHOW INDEXES FROM '
+            '{0}.{1} WHERE COLUMN_NAME = "{2}" AND NOT NON_UNIQUE'.format(
+            self.schema.name, table_b, 'rental_rate')).execute().fetch_all()))
 
         # Create table like another table
         lang = self.schema.create_table(table_c).like(table_a).execute()
