update parser version & fix tests

Author: xnuinside

poetry.lock

@@ -13,12 +13,12 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-table-meta = "^0.1.5"
+table-meta = "^0.2.1"
 jinja2 = "^3.0.3"
 
 [tool.poetry.dev-dependencies]
 pytest = "^5.2"
-simple-ddl-parser = "^0.24.0"
+simple-ddl-parser = "^0.24.1"
 m2r2 = "^0.3.2"
 twine = "^3.7.1"
 pre-commit = "^2.16.0"

pyproject.toml

@@ -12,6 +12,7 @@ def __init__(self, data: Dict, dialect: str = 'sql') -> None:
 
     def generate(self) -> str:
         self.tables = ddl_to_meta(self.data)
+
         self.generate_ddl()
         return self.ddl_output
 

simple_ddl_generator/core.py

@@ -19,7 +19,7 @@ def __init__(self, tables: TableMeta, dialect: str) -> None:
 
     def render_template(self) -> str:
         template = jinja2_env.get_template('common.jinja2')
-        
+        print(self.tables)
         return template.render(
             properties_as_is=hql_table_properties,
             **self.tables)

simple_ddl_generator/generator.py

@@ -1 +1 @@
-{{"EXTERNAL" if table.properties.external}}
+{{" EXTERNAL" if table.properties.external else ""}}

simple_ddl_generator/templates/before_table.jinja2

@@ -1,2 +1,2 @@
-CREATE{% include "before_table.jinja2" %} TABLE "{%if table.project%}{{table.project}}.{%endif%}{%if table.table_schema%}{{table.table_schema}}.{%endif%}{{table.name}}{% if table.columns %}" ({%for column in table.columns %}
+CREATE{% include "before_table.jinja2" %} TABLE{{" IF NOT EXISTS" if table.properties.if_not_exists else ""}} "{%if table.project%}{{table.project}}.{%endif%}{%if table.table_schema%}{{table.table_schema}}.{%endif%}{{table.name}}{% if table.columns %}" ({%for column in table.columns %}
 {% include "column.jinja2" %}{{"," if not loop.last }}{%endfor%}){% else %}"{% endif %}{% include "table_properties.jinja2" %};

simple_ddl_generator/templates/create_table.jinja2

@@ -13,7 +13,7 @@ def test_simple_generation():
 
 
 def test_partitioned_by():
-    expected = """CREATE TABLE "database.new_table_name" (
+    expected = """CREATE EXTERNAL TABLE IF NOT EXISTS "database.new_table_name" (
 day_long_nm string,
 calendar_dt date,
 source_batch_id string,
@@ -38,7 +38,7 @@ def test_partitioned_by():
             field_long      bigint
         ) PARTITIONED BY (batch_id int);"""
     # get result from parser
-    data = DDLParser(ddl).run(group_by_type=True, output_mode="bigquery")
+    data = DDLParser(ddl).run(group_by_type=True, output_mode="hql")
 
     # rename, for example, table name
 
@@ -72,15 +72,15 @@ def test_hql_several_more_properties():
     g = DDLGenerator(data)
     data["tables"][0]["location"] = "s3://new_location"
     g.generate()
-    expected = r"""CREATE TABLE "default.salesorderdetail" (
+    expected = r"""CREATE TABLE IF NOT EXISTS "default.salesorderdetail" (
 SalesOrderID int,
 ProductID int,
 OrderQty int,
 LineTotal decimal)
 PARTITIONED BY (batch_id int, batch_id2 string, batch_32 some_type)
 LOCATION s3://new_location
 ROW FORMAT DELIMITED
-FIELDS TERMINATED BY ,
+FIELDS TERMINATED BY ','
 MAP KEYS TERMINATED BY '\003'
 COLLECTION ITEMS TERMINATED BY '\002'
 STORED AS TEXTFILE;"""