google-pso-data-validator 6.0.0__tar.gz → 6.2.0__tar.gz

{google_pso_data_validator-6.0.0 → google_pso_data_validator-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-pso-data-validator
-Version: 6.0.0
+Version: 6.2.0
 Summary: A package to enable easy data validation
 Author: PSO DVT Engineering team
 Author-email: data-validator-eng@google.com
@@ -14,31 +14,26 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: attrs==23.1.0
-Requires-Dist: grpcio==1.53.2
-Requires-Dist: lazy-object-proxy==1.9.0
-Requires-Dist: marshmallow==3.19.0
-Requires-Dist: fsspec>=2022.8.2
-Requires-Dist: google-api-python-client==2.91.0
+Requires-Dist: Flask>=2.2
+Requires-Dist: fsspec>=2024.9.0
+Requires-Dist: google-api-python-client>=2.144.0
+Requires-Dist: google-cloud-bigquery>=3.25.0
+Requires-Dist: google-cloud-bigquery-storage>=2.26.0
+Requires-Dist: google-cloud-secret-manager>=2.20.2
+Requires-Dist: google-cloud-spanner>=3.49.1
+Requires-Dist: google-cloud-storage>=2.18.2
 Requires-Dist: ibis-framework==5.1.0
-Requires-Dist: impyla==0.18.0
-Requires-Dist: SQLAlchemy==1.4.49
-Requires-Dist: PyMySQL==1.1.1
-Requires-Dist: psycopg2-binary==2.9.6
-Requires-Dist: PyYAML==6.0
-Requires-Dist: pandas==1.5.3
-Requires-Dist: proto-plus==1.22.3
+Requires-Dist: impyla>=0.19.0
+Requires-Dist: jellyfish>=1.1.0
+Requires-Dist: pandas==2.0.3
+Requires-Dist: parsy>=2.1
+Requires-Dist: psycopg2-binary>=2.9.9
 Requires-Dist: pyarrow==14.0.1
-Requires-Dist: pydata-google-auth==1.8.0
-Requires-Dist: google-cloud-bigquery==3.11.3
-Requires-Dist: google-cloud-bigquery-storage==2.20.0
-Requires-Dist: google-cloud-spanner==3.36.0
-Requires-Dist: google-cloud-storage==2.10.0
-Requires-Dist: jellyfish==1.0.0
-Requires-Dist: tabulate==0.9.0
-Requires-Dist: Flask==2.3.2
-Requires-Dist: parsy==2.1
-Requires-Dist: google-cloud-secret-manager>=2.16.0
+Requires-Dist: pydata-google-auth>=1.8.2
+Requires-Dist: PyMySQL>=1.1.1
+Requires-Dist: PyYAML>=6.0.2
+Requires-Dist: SQLAlchemy==1.4.49
+Requires-Dist: tabulate>=0.9.0
 Provides-Extra: apache-airflow
 Requires-Dist: 1.10.11; extra == "apache-airflow"
 Provides-Extra: pyspark
@@ -133,7 +128,12 @@ over all columns ('*') will only run over numeric columns, unless the
 `--wildcard-include-string-len` or `--wildcard-include-timestamp` flags are present.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate column
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate column
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -141,7 +141,7 @@ data-validation (--verbose or -v) (--log-level or -ll) validate column
                         Target connection details
                         See: *Connections* section for each data source
   --tables-list or -tbls SOURCE_SCHEMA.SOURCE_TABLE=TARGET_SCHEMA.TARGET_TABLE
-                        Comma separated list of tables in the form schema.table=target_schema.target_table
+                        Comma separated list of tables in the form schema.table=target_schema.target_table. Or shorthand schema.* for all tables.
                         Target schema name and table name are optional.
                         i.e 'bigquery-public-data.new_york_citibike.citibike_trips'
   [--grouped-columns or -gc GROUPED_COLUMNS]
@@ -182,6 +182,7 @@ data-validation (--verbose or -v) (--log-level or -ll) validate column
                         Format for stdout output. Supported formats are (text, csv, json, table). Defaults to table.
   [--filter-status or -fs STATUSES_LIST]
                         Comma separated list of statuses to filter the validation results. Supported statuses are (success, fail). If no list is provided, all statuses are returned.
+
 ```
 
 The default aggregation type is a 'COUNT *', which will run in addition to the validations you specify. To remove this default,
@@ -212,7 +213,12 @@ Under the hood, row validation uses
 apply functions such as IFNULL() or RTRIM(). These can be edited in the YAML or JSON config file to customize your row validation.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate row
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate row
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -230,6 +236,8 @@ data-validation (--verbose or -v) (--log-level or -ll) validate row
                         See: *Calculated Fields* section for details
   --hash COLUMNS        Comma separated list of columns to hash or * for all columns
   --concat COLUMNS      Comma separated list of columns to concatenate or * for all columns (use if a common hash function is not available between databases)
+  [--exclude-columns or -ec]
+                        Flag to indicate the list of columns provided should be excluded from hash or concat instead of included.
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
                         BigQuery destination for validation results. Defaults to stdout.
                         See: *Validation Reports* section
@@ -268,8 +276,12 @@ The command generates and stores multiple YAML validations each representing a c
 The command takes the same parameters as required for `Row Validation` *plus* a few parameters to support partitioning. Single and multiple primary keys are supported and keys can be of any indexable type, except for date and timestamp type. A parameter used in earlier versions, ```partition-key``` is no longer supported.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) generate-table-partitions
-
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  generate-table-partitions
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -291,7 +303,7 @@ data-validation (--verbose or -v) (--log-level or -ll) generate-table-partitions
                         Directory Path to store YAML Config Files
                         GCS: Provide a full gs:// path of the target directory. Eg: `gs://<BUCKET>/partitions_dir`
                         Local: Provide a relative path of the target directory. Eg: `partitions_dir`
-  --partition-num INT, -pn INT 
+  --partition-num INT, -pn INT
                         Number of partitions into which the table should be split, e.g. 1000 or 10000
                         In case this value exceeds the row count of the source/target table, it will be decreased to max(source_row_count, target_row_count)
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
@@ -299,7 +311,7 @@ data-validation (--verbose or -v) (--log-level or -ll) generate-table-partitions
                         See: *Validation Reports* section
   [--service-account or -sa PATH_TO_SA_KEY]
                         Service account to use for BigQuery result handler output.
-  [--parts-per-file INT], [-ppf INT] 
+  [--parts-per-file INT], [-ppf INT]
                         Number of partitions in a yaml file, default value 1.
   [--filters SOURCE_FILTER:TARGET_FILTER]
                         Colon separated string values of source and target filters.
@@ -324,7 +336,12 @@ types between source and target.
 Note: An exclamation point before a data type (`!string`) signifies the column is non-nullable or required.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate schema
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate schema
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -332,7 +349,7 @@ data-validation (--verbose or -v) (--log-level or -ll) validate schema
                         Target connection details
                         See: *Connections* section for each data source
   --tables-list or -tbls SOURCE_SCHEMA.SOURCE_TABLE=TARGET_SCHEMA.TARGET_TABLE
-                        Comma separated list of tables in the form schema.table=target_schema.target_table
+                        Comma separated list of tables in the form schema.table=target_schema.target_table. Or shorthand schema.* for all tables.
                         Target schema name and table name are optional.
                         e.g.: 'bigquery-public-data.new_york_citibike.citibike_trips'
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
@@ -365,7 +382,12 @@ data-validation (--verbose or -v) (--log-level or -ll) validate schema
 Below is the command syntax for custom query column validations.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate custom-query column
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate custom-query column
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -427,7 +449,12 @@ in the SELECT statement of both source_query.sql and target_query.sql.  See *Pri
 Below is the command syntax for custom query row validations.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate custom-query row
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate custom-query row
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -452,6 +479,8 @@ data-validation (--verbose or -v) (--log-level or -ll) validate custom-query row
                         (use if a common hash function is not available between databases)
   --primary-key or -pk JOIN_KEY
                        Common column between source and target tables for join
+  [--exclude-columns or -ec]
+                        Flag to indicate the list of columns provided should be excluded from hash or concat instead of included.
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
                         BigQuery destination for validation results. Defaults to stdout.
                         See: *Validation Reports* section
@@ -483,7 +512,12 @@ The `validate` command takes a `--dry-run` command line flag that prints source
 and target SQL to stdout as JSON in lieu of performing a validation:
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate
   [--dry-run or -dr]    Prints source and target SQL to stdout in lieu of performing a validation.
 ```
 
@@ -514,7 +548,12 @@ GCS and local paths.
 You can use the `data-validation configs` command to run and view YAMLs.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) configs run
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  configs run
   [--config-file or -c CONFIG_FILE]
                         Path to YAML config file to run. Supports local and GCS paths.
   [--config-dir or -cdir CONFIG_DIR]

{google_pso_data_validator-6.0.0 → google_pso_data_validator-6.2.0}/README.md

@@ -87,7 +87,12 @@ over all columns ('*') will only run over numeric columns, unless the
 `--wildcard-include-string-len` or `--wildcard-include-timestamp` flags are present.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate column
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate column
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -95,7 +100,7 @@ data-validation (--verbose or -v) (--log-level or -ll) validate column
                         Target connection details
                         See: *Connections* section for each data source
   --tables-list or -tbls SOURCE_SCHEMA.SOURCE_TABLE=TARGET_SCHEMA.TARGET_TABLE
-                        Comma separated list of tables in the form schema.table=target_schema.target_table
+                        Comma separated list of tables in the form schema.table=target_schema.target_table. Or shorthand schema.* for all tables.
                         Target schema name and table name are optional.
                         i.e 'bigquery-public-data.new_york_citibike.citibike_trips'
   [--grouped-columns or -gc GROUPED_COLUMNS]
@@ -136,6 +141,7 @@ data-validation (--verbose or -v) (--log-level or -ll) validate column
                         Format for stdout output. Supported formats are (text, csv, json, table). Defaults to table.
   [--filter-status or -fs STATUSES_LIST]
                         Comma separated list of statuses to filter the validation results. Supported statuses are (success, fail). If no list is provided, all statuses are returned.
+
 ```
 
 The default aggregation type is a 'COUNT *', which will run in addition to the validations you specify. To remove this default,
@@ -166,7 +172,12 @@ Under the hood, row validation uses
 apply functions such as IFNULL() or RTRIM(). These can be edited in the YAML or JSON config file to customize your row validation.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate row
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate row
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -184,6 +195,8 @@ data-validation (--verbose or -v) (--log-level or -ll) validate row
                         See: *Calculated Fields* section for details
   --hash COLUMNS        Comma separated list of columns to hash or * for all columns
   --concat COLUMNS      Comma separated list of columns to concatenate or * for all columns (use if a common hash function is not available between databases)
+  [--exclude-columns or -ec]
+                        Flag to indicate the list of columns provided should be excluded from hash or concat instead of included.
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
                         BigQuery destination for validation results. Defaults to stdout.
                         See: *Validation Reports* section
@@ -222,8 +235,12 @@ The command generates and stores multiple YAML validations each representing a c
 The command takes the same parameters as required for `Row Validation` *plus* a few parameters to support partitioning. Single and multiple primary keys are supported and keys can be of any indexable type, except for date and timestamp type. A parameter used in earlier versions, ```partition-key``` is no longer supported.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) generate-table-partitions
-
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  generate-table-partitions
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -245,7 +262,7 @@ data-validation (--verbose or -v) (--log-level or -ll) generate-table-partitions
                         Directory Path to store YAML Config Files
                         GCS: Provide a full gs:// path of the target directory. Eg: `gs://<BUCKET>/partitions_dir`
                         Local: Provide a relative path of the target directory. Eg: `partitions_dir`
-  --partition-num INT, -pn INT 
+  --partition-num INT, -pn INT
                         Number of partitions into which the table should be split, e.g. 1000 or 10000
                         In case this value exceeds the row count of the source/target table, it will be decreased to max(source_row_count, target_row_count)
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
@@ -253,7 +270,7 @@ data-validation (--verbose or -v) (--log-level or -ll) generate-table-partitions
                         See: *Validation Reports* section
   [--service-account or -sa PATH_TO_SA_KEY]
                         Service account to use for BigQuery result handler output.
-  [--parts-per-file INT], [-ppf INT] 
+  [--parts-per-file INT], [-ppf INT]
                         Number of partitions in a yaml file, default value 1.
   [--filters SOURCE_FILTER:TARGET_FILTER]
                         Colon separated string values of source and target filters.
@@ -278,7 +295,12 @@ types between source and target.
 Note: An exclamation point before a data type (`!string`) signifies the column is non-nullable or required.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate schema
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate schema
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -286,7 +308,7 @@ data-validation (--verbose or -v) (--log-level or -ll) validate schema
                         Target connection details
                         See: *Connections* section for each data source
   --tables-list or -tbls SOURCE_SCHEMA.SOURCE_TABLE=TARGET_SCHEMA.TARGET_TABLE
-                        Comma separated list of tables in the form schema.table=target_schema.target_table
+                        Comma separated list of tables in the form schema.table=target_schema.target_table. Or shorthand schema.* for all tables.
                         Target schema name and table name are optional.
                         e.g.: 'bigquery-public-data.new_york_citibike.citibike_trips'
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
@@ -319,7 +341,12 @@ data-validation (--verbose or -v) (--log-level or -ll) validate schema
 Below is the command syntax for custom query column validations.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate custom-query column
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate custom-query column
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -381,7 +408,12 @@ in the SELECT statement of both source_query.sql and target_query.sql.  See *Pri
 Below is the command syntax for custom query row validations.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate custom-query row
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate custom-query row
   --source-conn or -sc SOURCE_CONN
                         Source connection details
                         See: *Data Source Configurations* section for each data source
@@ -406,6 +438,8 @@ data-validation (--verbose or -v) (--log-level or -ll) validate custom-query row
                         (use if a common hash function is not available between databases)
   --primary-key or -pk JOIN_KEY
                        Common column between source and target tables for join
+  [--exclude-columns or -ec]
+                        Flag to indicate the list of columns provided should be excluded from hash or concat instead of included.
   [--bq-result-handler or -bqrh PROJECT_ID.DATASET.TABLE]
                         BigQuery destination for validation results. Defaults to stdout.
                         See: *Validation Reports* section
@@ -437,7 +471,12 @@ The `validate` command takes a `--dry-run` command line flag that prints source
 and target SQL to stdout as JSON in lieu of performing a validation:
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) validate
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  validate
   [--dry-run or -dr]    Prints source and target SQL to stdout in lieu of performing a validation.
 ```
 
@@ -468,7 +507,12 @@ GCS and local paths.
 You can use the `data-validation configs` command to run and view YAMLs.
 
 ```
-data-validation (--verbose or -v) (--log-level or -ll) configs run
+data-validation
+  [--verbose or -v ]
+                        Verbose logging
+  [--log-level or -ll]
+                        Log Level to be assigned. Supported levels are (DEBUG,INFO,WARNING,ERROR,CRITICAL). Defaults to INFO.
+  configs run
   [--config-file or -c CONFIG_FILE]
                         Path to YAML config file to run. Supports local and GCS paths.
   [--config-dir or -cdir CONFIG_DIR]

{google_pso_data_validator-6.0.0 → google_pso_data_validator-6.2.0}/data_validation/__main__.py

@@ -24,11 +24,11 @@ from data_validation import (
     cli_tools,
     clients,
     consts,
-    jellyfish_distance,
     state_manager,
 )
 from data_validation.config_manager import ConfigManager
 from data_validation.data_validation import DataValidation
+from data_validation.find_tables import find_tables_using_string_matching
 from data_validation.partition_builder import PartitionBuilder
 
 # by default yaml dumps lists as pointers. This disables that feature
@@ -160,7 +160,7 @@ def get_aggregate_config(args, config_manager: ConfigManager):
     return aggregate_configs
 
 
-def get_calculated_config(args, config_manager) -> List[dict]:
+def get_calculated_config(args, config_manager: ConfigManager) -> List[dict]:
     """Return list of formatted calculated objects.
 
     Args:
@@ -168,12 +168,24 @@ def get_calculated_config(args, config_manager) -> List[dict]:
     """
     calculated_configs = []
     fields = []
-    if args.hash:
-        col_list = None if args.hash == "*" else cli_tools.get_arg_list(args.hash)
-        fields = config_manager.build_dependent_aliases("hash", col_list)
-    elif args.concat:
-        col_list = None if args.concat == "*" else cli_tools.get_arg_list(args.concat)
-        fields = config_manager.build_dependent_aliases("concat", col_list)
+    if config_manager.hash:
+        col_list = (
+            None
+            if config_manager.hash == "*"
+            else cli_tools.get_arg_list(config_manager.hash)
+        )
+        fields = config_manager.build_dependent_aliases(
+            "hash", col_list, args.exclude_columns
+        )
+    elif config_manager.concat:
+        col_list = (
+            None
+            if config_manager.concat == "*"
+            else cli_tools.get_arg_list(config_manager.concat)
+        )
+        fields = config_manager.build_dependent_aliases(
+            "concat", col_list, args.exclude_columns
+        )
 
     if len(fields) > 0:
         max_depth = max([x["depth"] for x in fields])
@@ -190,13 +202,13 @@ def get_calculated_config(args, config_manager) -> List[dict]:
                 custom_params=field.get("calc_params"),
             )
         )
-    if args.hash:
+    if config_manager.hash:
         config_manager.append_comparison_fields(
             config_manager.build_config_comparison_fields(
                 ["hash__all"], depth=max_depth
             )
         )
-    elif args.concat:
+    elif config_manager.concat:
         config_manager.append_comparison_fields(
             config_manager.build_config_comparison_fields(
                 ["concat__all"], depth=max_depth
@@ -212,6 +224,7 @@ def build_config_from_args(args: Namespace, config_manager: ConfigManager):
         args (Namespace): User specified Arguments
         config_manager (ConfigManager): Validation config manager instance.
     """
+
     # Append SCHEMA_VALIDATION configs
     if config_manager.validation_type == consts.SCHEMA_VALIDATION:
         if args.exclusion_columns is not None:
@@ -226,22 +239,18 @@ def build_config_from_args(args: Namespace, config_manager: ConfigManager):
         config_manager.append_custom_query_type(args.custom_query_type)
 
         # Get source sql query from source sql file or inline query
-        if args.source_query:
-            source_query_str = config_manager.get_query_from_inline(args.source_query)
-        else:
-            source_query_str = config_manager.get_query_from_file(
-                args.source_query_file
+        config_manager.append_source_query(
+            cli_tools.get_query_from_query_args(
+                args.source_query, args.source_query_file
             )
-        config_manager.append_source_query(source_query_str)
+        )
 
         # Get target sql query from target sql file or inline query
-        if args.target_query:
-            target_query_str = config_manager.get_query_from_inline(args.target_query)
-        else:
-            target_query_str = config_manager.get_query_from_file(
-                args.target_query_file
+        config_manager.append_target_query(
+            cli_tools.get_query_from_query_args(
+                args.target_query, args.target_query_file
             )
-        config_manager.append_target_query(target_query_str)
+        )
 
         # For custom-query column command
         if args.custom_query_type == consts.COLUMN_VALIDATION.lower():
@@ -254,6 +263,16 @@ def build_config_from_args(args: Namespace, config_manager: ConfigManager):
                 comparison_fields = cli_tools.get_arg_list(
                     args.comparison_fields, default_value=[]
                 )
+
+                # As per #1190, add rstrip for Teradata string comparison fields
+                if (
+                    config_manager.source_client.name == "teradata"
+                    or config_manager.target_client.name == "teradata"
+                ):
+                    comparison_fields = config_manager.add_rstrip_to_comp_fields(
+                        comparison_fields
+                    )
+
                 config_manager.append_comparison_fields(
                     config_manager.build_config_comparison_fields(comparison_fields)
                 )
@@ -296,7 +315,6 @@ def build_config_from_args(args: Namespace, config_manager: ConfigManager):
                 config_manager.source_client.name == "teradata"
                 or config_manager.target_client.name == "teradata"
             ):
-
                 comparison_fields = config_manager.add_rstrip_to_comp_fields(
                     comparison_fields
                 )
@@ -416,71 +434,6 @@ def build_config_managers_from_yaml(args, config_file_path):
     return config_managers
 
 
-def _compare_match_tables(source_table_map, target_table_map, score_cutoff=0.8):
-    """Return dict config object from matching tables."""
-    # TODO(dhercher): evaluate if improved comparison and score cutoffs should be used.
-    table_configs = []
-
-    target_keys = target_table_map.keys()
-    for source_key in source_table_map:
-        target_key = jellyfish_distance.extract_closest_match(
-            source_key, target_keys, score_cutoff=score_cutoff
-        )
-        if target_key is None:
-            continue
-
-        table_config = {
-            consts.CONFIG_SCHEMA_NAME: source_table_map[source_key][
-                consts.CONFIG_SCHEMA_NAME
-            ],
-            consts.CONFIG_TABLE_NAME: source_table_map[source_key][
-                consts.CONFIG_TABLE_NAME
-            ],
-            consts.CONFIG_TARGET_SCHEMA_NAME: target_table_map[target_key][
-                consts.CONFIG_SCHEMA_NAME
-            ],
-            consts.CONFIG_TARGET_TABLE_NAME: target_table_map[target_key][
-                consts.CONFIG_TABLE_NAME
-            ],
-        }
-        table_configs.append(table_config)
-
-    return table_configs
-
-
-def get_table_map(client, allowed_schemas=None):
-    """Return dict with searchable keys for table matching."""
-    table_map = {}
-    table_objs = clients.get_all_tables(client, allowed_schemas=allowed_schemas)
-
-    for table_obj in table_objs:
-        table_key = ".".join([t for t in table_obj if t])
-        table_map[table_key] = {
-            consts.CONFIG_SCHEMA_NAME: table_obj[0],
-            consts.CONFIG_TABLE_NAME: table_obj[1],
-        }
-
-    return table_map
-
-
-def find_tables_using_string_matching(args):
-    """Return JSON String with matched tables for use in validations."""
-    score_cutoff = args.score_cutoff or 1
-
-    mgr = state_manager.StateManager()
-    source_client = clients.get_data_client(mgr.get_connection_config(args.source_conn))
-    target_client = clients.get_data_client(mgr.get_connection_config(args.target_conn))
-
-    allowed_schemas = cli_tools.get_arg_list(args.allowed_schemas)
-    source_table_map = get_table_map(source_client, allowed_schemas=allowed_schemas)
-    target_table_map = get_table_map(target_client)
-
-    table_configs = _compare_match_tables(
-        source_table_map, target_table_map, score_cutoff=score_cutoff
-    )
-    return json.dumps(table_configs)
-
-
 def run_raw_query_against_connection(args):
     """Return results of raw query for ad hoc usage."""
     mgr = state_manager.StateManager()