Merge pull request #258 from xnuinside/v1.5.1_minor_addition

V1.5.1 minor addition

Author: xnuinside

CHANGELOG.txt

@@ -1,3 +1,11 @@
+**v1.5.1**
+### Improvements
+#### MySQL
+
+1. Added support for INDEX statement in column definition - https://github.com/xnuinside/simple-ddl-parser/issues/253
+2.
+
+
 **v1.5.0**
 
 ### Fixes

README.md

@@ -490,6 +490,14 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 
 
 ## Changelog
+**v1.5.1**
+### Improvements
+#### MySQL
+
+1. Added support for INDEX statement in column definition - https://github.com/xnuinside/simple-ddl-parser/issues/253
+2.
+
+
 **v1.5.0**
 
 ### Fixes

docs/README.rst

@@ -555,6 +555,18 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 Changelog
 ---------
 
+**v1.5.1**
+
+Improvements
+^^^^^^^^^^^^
+
+MySQL
+~~~~~
+
+
+#. Added support for INDEX statement in column definition - https://github.com/xnuinside/simple-ddl-parser/issues/253
+   2.
+
 **v1.5.0**
 
 Fixes

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "simple-ddl-parser"
-version = "1.5.0"
+version = "1.5.1"
 description = "Simple DDL Parser to parse SQL & dialects like HQL, TSQL (MSSQL), Oracle, AWS Redshift, Snowflake, MySQL, PostgreSQL, etc ddl files to json/python dict with full information about columns: types, defaults, primary keys, etc.; sequences, alters, custom types & other entities from ddl."
 authors = ["Iuliia Volkova <xnuinside@gmail.com>"]
 license = "MIT"

simple_ddl_parser/dialects/sql.py

@@ -419,6 +419,8 @@ def get_column_properties(p_list: List) -> Tuple:
         default = None
         unique = False
         references = None
+        index = False
+
         if isinstance(p_list[-1], str):
             if p_list[-1].upper() == "KEY":
                 if p_list[-2].upper() == "UNIQUE":
@@ -432,7 +434,9 @@ def get_column_properties(p_list: List) -> Tuple:
             p_list[-1]["references"]["column"] = p_list[-1]["references"]["columns"][0]
             del p_list[-1]["references"]["columns"]
             references = p_list[-1]["references"]
-        return pk, default, unique, references, nullable
+        if p_list[-1] == "INDEX":
+            index = True
+        return pk, default, unique, references, nullable, index
 
     def p_autoincrement(self, p: List) -> None:
         """autoincrement : AUTOINCREMENT"""
@@ -445,6 +449,7 @@ def p_defcolumn(self, p: List) -> None:
         | defcolumn PRIMARY KEY
         | defcolumn UNIQUE KEY
         | defcolumn UNIQUE
+        | defcolumn INDEX
         | defcolumn check_ex
         | defcolumn default
         | defcolumn collate
@@ -470,7 +475,9 @@ def p_defcolumn(self, p: List) -> None:
         p[0] = p[1]
         p_list = list(p)
 
-        pk, default, unique, references, nullable = self.get_column_properties(p_list)
+        pk, default, unique, references, nullable, index = self.get_column_properties(
+            p_list
+        )
 
         self.set_property(p)
 
@@ -486,6 +493,8 @@ def p_defcolumn(self, p: List) -> None:
         if isinstance(p_list[-1], dict) and p_list[-1].get("encode"):
             p[0]["encode"] = p[0].get("encode", p_list[-1]["encode"])
         p[0]["check"] = self.set_check_in_columm(p[0].get("check"))
+        if index:
+            p[0]["index"] = index
 
     @staticmethod
     def set_check_in_columm(check: Optional[List]) -> Optional[str]:

simple_ddl_parser/parsetab.py

@@ -557,3 +557,38 @@ def test_auto_increment_table_property():
 
     result = DDLParser(ddl).run(output_mode="mysql")
     assert result == expected
+
+
+def test_column_index():
+    ddl = """CREATE TABLE `posts`(
+        `integer_column__index` INT NOT NULL INDEX
+    );"""
+
+    result = DDLParser(ddl).run()
+    expected = [
+        {
+            "alter": {},
+            "checks": [],
+            "columns": [
+                {
+                    "check": None,
+                    "default": None,
+                    "index": True,
+                    "name": "`integer_column__index`",
+                    "nullable": False,
+                    "references": None,
+                    "size": None,
+                    "type": "INT",
+                    "unique": False,
+                }
+            ],
+            "index": [],
+            "partitioned_by": [],
+            "primary_key": [],
+            "schema": None,
+            "table_name": "`posts`",
+            "tablespace": None,
+        }
+    ]
+
+    assert result == expected