Merge branch 'main' into some-refactorings-1

xnuinside · Aug 1, 2024 · d2413d5 · d2413d5
2 parents 2bc0075 + 2ef4718
commit d2413d5
Show file tree

Hide file tree

Showing 6 changed files with 566 additions and 54,520 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+**v1.5.2**
+### Fixes
+
+1. In Snowflake Fix unexpected behaviour when file_format name given - https://github.com/xnuinside/simple-ddl-parser/issues/273
+2.
+
 **v1.5.1**
 ### Improvements
 #### MySQL

diff --git a/README.md b/README.md
@@ -488,8 +488,15 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 * https://github.com/ankitdata ,
 * https://github.com/kalyan939
 
-
 ## Changelog
+
+**v1.5.2**
+
+### Fixes
+
+1. Fix Snowflake unexpected behaviour when file_format name given - https://github.com/xnuinside/simple-ddl-parser/issues/273
+2.
+
 **v1.5.1**
 ### Improvements
 #### MySQL

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "simple-ddl-parser"
-version = "1.5.1"
+version = "1.5.2"
 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"

diff --git a/simple_ddl_parser/dialects/snowflake.py b/simple_ddl_parser/dialects/snowflake.py
@@ -38,16 +38,21 @@ def p_multi_id_or_string(self, p: List) -> None:
             p[0] = value
 
     def p_fmt_equals(self, p: List) -> None:
-        """fmt_equals : id LP multi_id_or_string RP"""
+        """fmt_equals : id LP multi_id_or_string RP
+        | id id_or_string
+        """
         fmt_split = re.compile(
             r"\w+\s*=\s*\w+|\w+\s*=\s*'.'|\w+\s*=\s*'..'|\w+\s*=\s*\('.+'\)|\w+\s*=\(\)"
         )
         p_list = list(p)
-        p[0] = {
-            f.split("=")[0].strip(): f.split("=")[1].strip()
-            for f in fmt_split.findall(p_list[3])
-            if "=" in f
-        }
+        if len(p_list) > 3:
+            p[0] = {
+                f.split("=")[0].strip(): f.split("=")[1].strip()
+                for f in fmt_split.findall(p_list[3])
+                if "=" in f
+            }
+        else:
+            p[0] = str(p_list[-1])
 
     def p_table_property_equals(self, p: List) -> None:
         """table_property_equals : id id id_or_string