quillsql 2.1.4__tar.gz → 2.1.6__tar.gz

{quillsql-2.1.4 → quillsql-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quillsql
-Version: 2.1.4
+Version: 2.1.6
 Summary: Quill SDK for Python.
 Home-page: https://github.com/quill-sql/quill-python
 Author: Quill

{quillsql-2.1.4 → quillsql-2.1.6}/quillsql/core.py

@@ -112,7 +112,9 @@ class Quill:
         if not queries:
             return {"queryResults": []}
         if databaseType and databaseType.lower() != pkDatabaseType.lower():
-            return {"dbMismatched": True, "backendDatbaseType": pkDatabaseType}
+            return {"dbMismatched": True, "backendDatabaseType": pkDatabaseType}
+        if runQueryConfig and runQueryConfig.get("getColumnsForSchema"):
+            return {"queryResults": []}
         if runQueryConfig and runQueryConfig.get("arrayToMap"):
             array_to_map(
                 queries, runQueryConfig.get("arrayToMap"), metadata, self.target_connection
@@ -141,10 +143,8 @@ class Quill:
                 queries = [query.strip().rstrip(";") + " limit " + runQueryConfig.get("limitBy") for query in queries]
             query_results = [self.target_connection.query(query) for query in queries]
             results["queryResults"] = query_results
-            if runQueryConfig and runQueryConfig.get("removeFields"):
-                results["queryResults"] = remove_fields(
-                    query_results, runQueryConfig.get("removeFields")
-                )
+            if runQueryConfig and runQueryConfig.get("fieldsToRemove"):
+                results["queryResults"] = [ remove_fields(query_result, runQueryConfig.get("fieldsToRemove")) for query_result in results["queryResults"]]
             if runQueryConfig and runQueryConfig.get("convertDatatypes"):
                 for query_result in results["queryResults"]:
                     query_result["fields"] = [

{quillsql-2.1.4 → quillsql-2.1.6}/quillsql/utils/run_query_processes.py

@@ -1,18 +1,17 @@
 import json
 
-def remove_fields(query_result, cursor_description, fields_to_remove):
+def remove_fields(query_result, fields_to_remove):
   fields = [
-      {"name": desc[0], "dataTypeID": desc[1]}
-      for desc in cursor_description
-      if desc[0] in fields_to_remove
+      {"name": field['name'], "dataTypeID": field['dataTypeID']}
+      for field in query_result['fields']
+      if field['name'] not in fields_to_remove
   ]
-  rows = [dict(json.loads(json.dumps(row, default=str))) for row in query_result]
-
+  rows = [row for row in query_result['rows']]
   for row in rows:
     for field in fields_to_remove:
       if field in row:
           del row[field]
-  return {fields, rows}
+  return {"fields": fields, "rows": rows}
 
 def array_to_map(queries, array_to_map, metadata, target_pool):
   for i in range(len(queries)):

{quillsql-2.1.4 → quillsql-2.1.6}/quillsql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quillsql
-Version: 2.1.4
+Version: 2.1.6
 Summary: Quill SDK for Python.
 Home-page: https://github.com/quill-sql/quill-python
 Author: Quill

{quillsql-2.1.4 → quillsql-2.1.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="quillsql",
-    version="2.1.4",
+    version="2.1.6",
     packages=find_packages(),
     install_requires=[
         "psycopg2-binary",