release 1.4.0 temp + is_global for oracle

Author: xnuinside

CHANGELOG.txt

@@ -1,3 +1,14 @@
+**v1.4.0**
+
+### Fixes
+#### BigQuery:
+1. Indexes without schema causes issues in BigQuery dialect - fixed.
+
+### Improvements
+#### Oracle:
+1. Added new output keywords in table definition - `temp` & `is_global`. Added support for create global temporary table - https://github.com/xnuinside/simple-ddl-parser/issues/182
+
+
 **v1.3.0**
 
 ### Fixes

README.md

@@ -486,6 +486,17 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 
 
 ## Changelog
+**v1.4.0**
+
+### Fixes
+#### BigQuery:
+1. Indexes without schema causes issues in BigQuery dialect - fixed.
+
+### Improvements
+#### Oracle:
+1. Added new output keywords in table definition - `temp` & `is_global`. Added support for create global temporary table - https://github.com/xnuinside/simple-ddl-parser/issues/182
+
+
 **v1.3.0**
 
 ### Fixes

docs/README.rst

@@ -549,6 +549,26 @@ for help with debugging & testing support for BigQuery dialect DDLs:
 Changelog
 ---------
 
+**v1.4.0**
+
+Fixes
+^^^^^
+
+BigQuery:
+~~~~~~~~~
+
+
+#. Indexes without schema causes issues in BigQuery dialect - fixed.
+
+Improvements
+^^^^^^^^^^^^
+
+Oracle:
+~~~~~~~
+
+
+#. Added new output keywords in table definition - ``temp`` & ``is_global``. Added support for create global temporary table - https://github.com/xnuinside/simple-ddl-parser/issues/182
+
 **v1.3.0**
 
 Fixes

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "simple-ddl-parser"
-version = "1.3.0"
+version = "1.4.0"
 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 <[email protected]>"]
 license = "MIT"

simple_ddl_parser/dialects/sql.py

@@ -161,6 +161,7 @@ def p_create_table(self, p: List):
         | CREATE OR REPLACE TABLE
         | CREATE id TABLE IF NOT EXISTS
         | CREATE id TABLE
+        | CREATE id id TABLE
         | CREATE OR REPLACE id TABLE IF NOT EXISTS
         | CREATE OR REPLACE id TABLE
 
@@ -173,14 +174,21 @@ def p_create_table(self, p: List):
 
         if "REPLACE" in p_list:
             p[0]["replace"] = True
-
-        id_key = p_list[4] if "REPLACE" in p_list else p_list[2]
+        if "REPLACE" in p_list:
+            id_key = p_list[4]
+        elif len(p_list) == 5:
+            id_key = p_list[3]
+        else:
+            id_key = p_list[2]
         id_key = id_key.upper()
-
         if id_key in ["EXTERNAL", "TRANSIENT"]:
             p[0][id_key.lower()] = True
+        elif id_key in ["GLOBAL"]:
+            p[0]["is_global"] = True
         elif id_key in ["TEMP", "TEMPORARY"]:
             p[0]["temp"] = True
+            if len(p_list) == 5 and p_list[2].upper() == "GLOBAL":
+                p[0]["is_global"] = True
 
 
 class Column:

simple_ddl_parser/output/core.py

@@ -38,16 +38,21 @@ def get_table_from_tables_data(self, schema: str, table_name: str) -> Dict:
         return target_table
 
     def clean_up_index_statement(self, statement: Dict) -> None:
-        del statement[self.schema_key]
+        try:
+            del statement[self.schema_key]
+        except KeyError:
+            del statement["schema"]
         del statement["table_name"]
 
         if self.output_mode != "mssql":
             del statement["clustered"]
 
     def add_index_to_table(self, statement: Dict) -> None:
         """populate 'index' key in output data"""
+
         target_table = self.get_table_from_tables_data(
-            statement[self.schema_key], statement["table_name"]
+            statement.get(self.schema_key) or statement.get("schema"),
+            statement["table_name"],
         )
         self.clean_up_index_statement(statement)
         target_table.index.append(statement)

simple_ddl_parser/output/dialects.py

@@ -101,7 +101,7 @@ class MySSQL(Dialect):
 @dataclass
 @dialect(name="bigquery")
 class BigQuery(Dialect):
-    dataset: Optional[str] = field(default=False)
+    dataset: Optional[str] = field(default=None)
     project: Optional[str] = field(
         default=None, metadata={"exclude_if_not_provided": True}
     )
@@ -186,6 +186,7 @@ class PostgreSQL(Dialect):
 class Oracle(Dialect):
     # https://oracle-base.com/articles/8i/index-organized-tables
 
+    is_global: Optional[bool] = field(default=False)
     organization_index: Optional[bool] = field(
         default=False, metadata={"exclude_if_not_provided": True}
     )
@@ -253,7 +254,7 @@ class CommonDialectsFieldsMixin(Dialect):
     """base fields & mixed between dialects"""
 
     temp: Optional[bool] = field(
-        default=False, metadata={"output_modes": add_dialects([HQL, Redshift])}
+        default=False, metadata={"output_modes": add_dialects([HQL, Redshift, Oracle])}
     )
     tblproperties: Optional[dict] = field(
         default_factory=dict,

simple_ddl_parser/output/table_data.py

@@ -63,7 +63,6 @@ def pre_load_mods(cls, main_cls, kwargs):
         table_properties = {
             k.lower(): v for k, v in kwargs.items() if k.lower() not in table_main_args
         }
-
         init_data = {}
         init_data.update(table_main_args)
         init_data.update(table_properties)

simple_ddl_parser/parsetab.py

@@ -994,3 +994,46 @@ def test_date_trunc():
     ]
 
     assert result == expected
+
+
+def test_index_without_schema():
+    ddl = """CREATE TABLE t1 (
+      val INT,
+    );
+    CREATE INDEX idx1 ON t1(val);"""
+
+    result = DDLParser(ddl).run(output_mode="bigquery")
+    expected = [
+        {
+            "alter": {},
+            "checks": [],
+            "columns": [
+                {
+                    "check": None,
+                    "default": None,
+                    "name": "val",
+                    "nullable": True,
+                    "references": None,
+                    "size": None,
+                    "type": "INT",
+                    "unique": False,
+                }
+            ],
+            "dataset": None,
+            "index": [
+                {
+                    "columns": ["val"],
+                    "detailed_columns": [
+                        {"name": "val", "nulls": "LAST", "order": "ASC"}
+                    ],
+                    "index_name": "idx1",
+                    "unique": False,
+                }
+            ],
+            "partitioned_by": [],
+            "primary_key": [],
+            "table_name": "t1",
+            "tablespace": None,
+        }
+    ]
+    assert expected == result