merge test cases for USING in CREATE INDEX

Author: MohamedAbdeen21

src/ast/ddl.rs

@@ -2361,6 +2361,8 @@ pub struct CreateIndex {
     pub name: Option<ObjectName>,
     #[cfg_attr(feature = "visitor", visit(with = "visit_relation"))]
     pub table_name: ObjectName,
+    /// Index type used in the statement. Can also be found inside [`CreateIndex::index_options`]
+    /// depending on the position of the option within the statement.
     pub using: Option<IndexType>,
     pub columns: Vec<IndexColumn>,
     pub unique: bool,

src/parser/mod.rs

@@ -7123,6 +7123,13 @@ impl<'a> Parser<'a> {
         // parse it anyway (as we do inside `ALTER TABLE` and `CREATE TABLE` parsing).
         let index_options = self.parse_index_options()?;
 
+        if index_options
+            .iter()
+            .any(|opt| matches!(opt, IndexOption::Using(_)))
+        {
+            using = None;
+        };
+
         // MySQL allows `ALGORITHM` and `LOCK` options. Unlike in `ALTER TABLE`, they need not be comma separated.
         let mut alter_options = Vec::new();
         while self

tests/sqlparser_common.rs

@@ -17248,10 +17248,10 @@ fn parse_invisible_column() {
 }
 
 #[test]
-fn parse_create_index_using_before_on() {
+fn parse_create_index_different_using_positions() {
     let sql = "CREATE INDEX idx_name USING BTREE ON table_name (col1)";
-    // Can't use `verified_stmt` here as the USING will be placed after the `ON` clause
-    match all_dialects().parse_sql_statements(sql).unwrap()[0].clone() {
+    let expected = "CREATE INDEX idx_name ON table_name USING BTREE (col1)";
+    match all_dialects().one_statement_parses_to(sql, expected) {
         Statement::CreateIndex(CreateIndex {
             name,
             table_name,
@@ -17268,24 +17268,23 @@ fn parse_create_index_using_before_on() {
         }
         _ => unreachable!(),
     }
-}
 
-#[test]
-fn parse_create_index_using_multiple_clauses() {
-    let sql = "CREATE INDEX idx_name USING BTREE ON table_name USING HASH (col1)";
-    // Can't use `verified_stmt` here as the first USING will be ignored
-    match all_dialects().parse_sql_statements(sql).unwrap()[0].clone() {
+    let sql = "CREATE INDEX idx_name USING BTREE ON table_name (col1) USING HASH";
+    let expected = "CREATE INDEX idx_name ON table_name(col1) USING HASH";
+    match all_dialects().one_statement_parses_to(sql, expected) {
         Statement::CreateIndex(CreateIndex {
             name,
             table_name,
-            using,
             columns,
+            index_options,
             ..
         }) => {
             assert_eq!(name.unwrap().to_string(), "idx_name");
             assert_eq!(table_name.to_string(), "table_name");
-            assert_eq!(using, Some(IndexType::Hash));
             assert_eq!(columns.len(), 1);
+            assert!(index_options
+                .iter()
+                .any(|o| o == &IndexOption::Using(IndexType::Hash)));
         }
         _ => unreachable!(),
     }