syntax error & other fixes (#69)

* syntax error * syntax error * text instead of json * commit * rollback Co-authored-by: ncgl-syngenta <[email protected]>
syngenta · Sep 7, 2021 · 62c45fb · 62c45fb
1 parent 26b7aff
commit 62c45fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/syngenta_digital_dta/postgres/adapter.py b/syngenta_digital_dta/postgres/adapter.py
@@ -131,7 +131,7 @@ def bulk_insert_json(
             function_map=function_map or {}
         )
 
-        self.__execute(query=statement, params={})
+        self.__execute(query=statement, params={}, commit=True, rollback=True)
 
     def create_index(self, table_name, index_columns):
         index_name = f"index_{'_'.join(index_columns)}"

diff --git a/syngenta_digital_dta/postgres/json_formatting.py b/syngenta_digital_dta/postgres/json_formatting.py
@@ -11,7 +11,7 @@ def insert_json_into_table(
         f"""{_build_json_cte(json)}
         {_build_insert_statement(table_name, column_map, json_column_map)}
         {_build_select_statement(column_map, json_column_map, function_map or {})}
-        FROM ({_build_json_array_subquery(target_key)}
+        FROM ({_build_json_array_subquery(target_key)})x
 """
     )
 
@@ -63,7 +63,7 @@ def _parse_json_line(k, v):
     parts = v.split('.')
 
     if len(parts) == 2:
-        statement = f"_jsondict -> '{parts[1]}' AS {k}"
+        statement = f"_jsondict ->> '{parts[1]}' AS {k}"
 
     elif len(parts) == 3:
         statement = f"_jsondict -> '{parts[1]}' ->> '{parts[2]}' AS {k}"

diff --git a/tests/syngenta_digital_dta/postgres/test_json_formatting.py b/tests/syngenta_digital_dta/postgres/test_json_formatting.py
@@ -129,7 +129,7 @@ def test_insert_json_into_table(self):
         expected = """WITH _json_cte AS (SELECT '{}'::json AS _json)
         INSERT INTO my_table (guuid, created_at, updated_at, time, machine, secID)
         SELECT generate_uuid_v4() AS guuid, now() AS created_at, now() AS updated_at, _jsondict -> 'properties' ->> 'Time' AS time, _jsondict -> 'properties' ->> 'Machine' AS machine, _jsondict -> 'properties' ->> 'SecID' AS secID
-        FROM (SELECT json_array_elements(_json->'feature') AS _jsondict FROM _json_cte
+        FROM (SELECT json_array_elements(_json->'feature') AS _jsondict FROM _json_cte)x
 """
 
         self.assertEqual(expected, actual)
@@ -164,7 +164,7 @@ def test_insert_json_into_table_function_map(self):
         expected = """WITH _json_cte AS (SELECT '{}'::json AS _json)
         INSERT INTO my_table (guuid, created_at, updated_at, time, machine, secID)
         SELECT generate_uuid_v4() AS guuid, now() AS created_at, now() AS updated_at, _jsondict -> 'properties' ->> 'Time' AS time, _jsondict -> 'properties' ->> 'Machine' AS machine, cast(_jsondict -> 'properties' ->> 'SecID' as varchar) as secID
-        FROM (SELECT json_array_elements(_json->'feature') AS _jsondict FROM _json_cte
+        FROM (SELECT json_array_elements(_json->'feature') AS _jsondict FROM _json_cte)x
 """
 
         self.assertEqual(expected, actual)