Merge pull request #275 from xnuinside/release_1.5.3

release 1.5.3

Author: xnuinside

CHANGELOG.txt

@@ -1,8 +1,14 @@
-**v1.5.2**
+**v1.5.3**
 ### Fixes
 
 1. In Snowflake Fix unexpected behaviour when file_format name given - https://github.com/xnuinside/simple-ddl-parser/issues/273
-2.
+
+
+**v1.5.2**
+### Improvements
+#### MySQL
+1. Added support for COLLATE - https://github.com/xnuinside/simple-ddl-parser/pull/266/files
+
 
 **v1.5.1**
 ### Improvements

CONTRIBUTING.md

@@ -33,7 +33,7 @@ There is a lot of way how you can contribute to any project (not only in this),
 
 - Add more tests to the code
 
-It's always needed, I have only functional tests right now, so if you want to help wiht covering library for example, with unittests - please welcome, open the PR.
+It's always needed, I have only functional tests right now, so if you want to help with covering library for example, with unittests - please welcome, open the PR.
 
 For ANY type of contributinon I will really really appritiate. Each of them are important.
 

README.md

@@ -489,14 +489,18 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 * https://github.com/kalyan939
 
 ## Changelog
-
-**v1.5.2**
-
+**v1.5.3**
 ### Fixes
 
-1. Fix Snowflake unexpected behaviour when file_format name given - https://github.com/xnuinside/simple-ddl-parser/issues/273
+1. In Snowflake Fix unexpected behaviour when file_format name given - https://github.com/xnuinside/simple-ddl-parser/issues/273
 2.
 
+**v1.5.2**
+### Improvements
+#### MySQL
+1. Added support for COLLATE - https://github.com/xnuinside/simple-ddl-parser/pull/266/files
+
+
 **v1.5.1**
 ### Improvements
 #### MySQL

docs/README.rst

@@ -96,10 +96,8 @@ How to use
 Extract additional information from HQL (& other dialects)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In some dialects like HQL there is a lot of additional information about table like, fore example, is it external table,
-STORED AS, location & etc. This property will be always empty in 'classic' SQL DB like PostgreSQL or MySQL
-and this is the reason, why by default this information is 'hidden'.
-Also some fields are hidden in HQL, because they are simple not exists in HIVE, for example 'deferrable_initially'
+In some dialects like HQL there is a lot of additional information about table like, fore example, is it external table, STORED AS, location & etc. This property will be always empty in 'classic' SQL DB like PostgreSQL or MySQL and this is the reason, why by default this information are 'hidden'.
+Also some fields hidden in HQL, because they are simple not exists in HIVE, for example 'deferrable_initially'
 To get this 'hql' specific details about table in output please use 'output_mode' argument in run() method.
 
 example:
@@ -557,6 +555,26 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 Changelog
 ---------
 
+**v1.5.3**
+
+Fixes
+^^^^^
+
+
+#. In Snowflake Fix unexpected behaviour when file_format name given - https://github.com/xnuinside/simple-ddl-parser/issues/273
+   2.
+
+**v1.5.2**
+
+Improvements
+^^^^^^^^^^^^
+
+MySQL
+~~~~~
+
+
+#. Added support for COLLATE - https://github.com/xnuinside/simple-ddl-parser/pull/266/files
+
 **v1.5.1**
 
 Improvements

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "simple-ddl-parser"
-version = "1.5.2"
+version = "1.5.3"
 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/__init__.py

@@ -1,6 +1,17 @@
-from simple_ddl_parser.ddl_parser import DDLParser, DDLParserError, parse_from_file
+from simple_ddl_parser.ddl_parser import (
+    DDLParser,
+    DDLParserError,
+    SimpleDDLParserException,
+    parse_from_file,
+)
 from simple_ddl_parser.output.dialects import dialect_by_name
 
 supported_dialects = dialect_by_name
 
-__all__ = ["DDLParser", "parse_from_file", "DDLParserError", "supported_dialects"]
+__all__ = [
+    "DDLParser",
+    "parse_from_file",
+    "DDLParserError",
+    "supported_dialects",
+    "SimpleDDLParserException",
+]

simple_ddl_parser/ddl_parser.py

@@ -16,11 +16,15 @@
     Snowflake,
     SparkSQL,
 )
-# "DDLParserError" is an alias for backward compatibility
-from simple_ddl_parser.exception import SimpleDDLParserException as DDLParserError
+from simple_ddl_parser.exception import SimpleDDLParserException
 from simple_ddl_parser.parser import Parser
 
 
+# "DDLParserError" is an alias for backward compatibility
+class DDLParserError(SimpleDDLParserException):
+    pass
+
+
 class Dialects(
     SparkSQL,
     Snowflake,

simple_ddl_parser/exception.py

@@ -4,6 +4,6 @@
 
 
 class SimpleDDLParserException(Exception):
-    """ Base exception in simple ddl parser library """
-    pass
+    """Base exception in simple ddl parser library"""
 
+    pass

simple_ddl_parser/parsetab.py

@@ -1,5 +1,5 @@
 import re
-from typing import List, Tuple, Optional, Union, Any
+from typing import Any, List, Optional, Tuple, Union
 
 # Backward compatibility import
 from simple_ddl_parser.exception import SimpleDDLParserException
@@ -10,10 +10,10 @@
     "find_first_unpair_closed_par",
     "normalize_name",
     "get_table_id",
-    "SimpleDDLParserException"
+    "SimpleDDLParserException",
 ]
 
-_parentheses = ('(', ')')
+_parentheses = ("(", ")")
 
 
 def remove_par(p_list: List[Union[str, Any]]) -> List[Union[str, Any]]:
@@ -59,9 +59,9 @@ def find_first_unpair_closed_par(str_: str) -> Optional[int]:
     """
     count_open = 0
     for i, char in enumerate(str_):
-        if char == '(':
+        if char == "(":
             count_open += 1
-        if char == ')':
+        if char == ")":
             count_open -= 1
         if count_open < 0:
             return i