google-pso-data-validator 7.0.0__tar.gz → 7.1.0__tar.gz

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: google-pso-data-validator
-Version: 7.0.0
+Version: 7.1.0
 Summary: A package to enable easy data validation
 Author: PSO DVT Engineering team
 Author-email: data-validator-eng@google.com
@@ -38,6 +38,15 @@ Provides-Extra: apache-airflow
 Requires-Dist: 1.10.11; extra == "apache-airflow"
 Provides-Extra: pyspark
 Requires-Dist: 3.0.0; extra == "pyspark"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Data Validation Tool
 

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/data_validation/__main__.py

@@ -643,8 +643,8 @@ def run_connections(args):
     elif args.connect_cmd == "add":
         conn = cli_tools.get_connection_config_from_args(args)
         # Test getting a client to validate connection details
-        _ = clients.get_data_client(conn)
-        cli_tools.store_connection(args.connection_name, conn)
+        with clients.get_data_client_ctx(conn) as _:
+            cli_tools.store_connection(args.connection_name, conn)
     else:
         raise ValueError(f"Connections Argument '{args.connect_cmd}' is not supported")
 

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/data_validation/clients.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 
+from contextlib import contextmanager
 import copy
 import logging
 from typing import TYPE_CHECKING
@@ -317,6 +318,24 @@ def get_data_client(connection_config):
     return data_client
 
 
+@contextmanager
+def get_data_client_ctx(*args, **kwargs):
+    """Provide get_data_client() via a context manager."""
+    client = None
+    try:
+        client = get_data_client(*args, **kwargs)
+        yield client
+    finally:
+        # TODO When we upgrade Ibis beyond 5.x this try/except may become redundant.
+        # https://github.com/GoogleCloudPlatform/professional-services-data-validator/issues/1376
+        if hasattr(client, "close"):
+            try:
+                client.close()
+            except Exception as exc:
+                # No need to reraise, we can silently fail if exiting throws up an issue.
+                logging.warning("Exception closing connection: %s", str(exc))
+
+
 def get_max_column_length(client):
     """Return the max column length supported by client.
 

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/data_validation/raw_query.py

@@ -20,14 +20,14 @@ from data_validation import clients, state_manager
 def run_raw_query_against_connection(args) -> list:
     """Return results of raw query for ad hoc usage."""
     mgr = state_manager.StateManager()
-    client = clients.get_data_client(mgr.get_connection_config(args.conn))
-    cursor = client.raw_sql(args.query)
-    res = cursor.fetchall()
-    try:
-        cursor.close()
-    except Exception:
-        pass
-    return res
+    with clients.get_data_client_ctx(mgr.get_connection_config(args.conn)) as client:
+        cursor = client.raw_sql(args.query)
+        res = cursor.fetchall()
+        try:
+            cursor.close()
+        except Exception:
+            pass
+        return res
 
 
 def print_raw_query_output(query_output: list):

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/google_pso_data_validator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: google-pso-data-validator
-Version: 7.0.0
+Version: 7.1.0
 Summary: A package to enable easy data validation
 Author: PSO DVT Engineering team
 Author-email: data-validator-eng@google.com
@@ -38,6 +38,15 @@ Provides-Extra: apache-airflow
 Requires-Dist: 1.10.11; extra == "apache-airflow"
 Provides-Extra: pyspark
 Requires-Dist: 3.0.0; extra == "pyspark"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Data Validation Tool
 

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/setup.py

@@ -18,7 +18,7 @@ import setuptools
 
 name = "google-pso-data-validator"
 description = "A package to enable easy data validation"
-version = "7.0.0"
+version = "7.1.0"
 release_status = "Development Status :: 4 - Beta"
 
 with open("README.md", "r") as fh:

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/third_party/ibis/ibis_oracle/registry.py

@@ -154,6 +154,10 @@ def _cast(t, op):
                 "ELSE TO_NUMBER(NULL) END"
             )
         )
+    elif (arg_dtype.is_timestamp() or arg_dtype.is_date()) and typ.is_date():
+        # If we are casting to Date then simulate what all other engines
+        # understand to be a Date, which is without the time element.
+        return sa.func.cast(sa.func.TRUNC(sa_arg), sa.types.Date)
 
     # Follow the original Ibis code path.
     return sa_fixed_cast(t, op)

{google_pso_data_validator-7.0.0 → google_pso_data_validator-7.1.0}/third_party/ibis/ibis_postgres/datatypes.py

@@ -13,10 +13,24 @@
 # limitations under the License.
 
 import ibis.expr.datatypes as dt
+from sqlalchemy.sql import sqltypes
 from sqlalchemy.dialects import postgresql
-from sqlalchemy.dialects.postgresql.base import PGDialect
+from sqlalchemy.dialects.postgresql.base import PGDialect, ischema_names
+
+
+class XML(sqltypes.TypeEngine):
+    __visit_name__ = "XML"
+
+
+ischema_names["xml"] = XML
 
 
 @dt.dtype.register(PGDialect, postgresql.OID)
 def sa_pg_oid(_, sa_type, nullable=True):
     return dt.int32(nullable=nullable)
+
+
+# Matching Ibis v9.2 behaviour and mapping PostgreSQL xml type to unknown.
+@dt.dtype.register(PGDialect, XML)
+def sa_pg_xml(_, sa_type, nullable=True):
+    return dt.Unknown(nullable=nullable)