From 17abad9300e4a96a14f94da486ef8307f7d27e06 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Thu, 6 Apr 2023 12:31:05 +0300
Subject: Remove deprecated `gn3.db_utils.database_connector` function

Remove the deprecated function and fix a myriad of bugs that arise from
removing the function.

Issue: https://issues.genenetwork.org/issues/bugfix_coupling_current_app_and_db_utils
---
 tests/performance/perf_query.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tests/performance')

diff --git a/tests/performance/perf_query.py b/tests/performance/perf_query.py
index e534e9b..cdac9a9 100644
--- a/tests/performance/perf_query.py
+++ b/tests/performance/perf_query.py
@@ -7,7 +7,7 @@ from inspect import getmembers
 from inspect import isfunction
 
 from functools import wraps
-from gn3.db_utils import database_connector
+from gn3.db_utils import database_connection
 
 
 def timer(func):
@@ -26,9 +26,10 @@ def timer(func):
 
 
 def query_executor(query: str,
+                   sql_uri: str,
                    fetch_all: bool = True):
     """function to execute a query"""
-    with database_connector() as conn:
+    with database_connection(sql_uri) as conn:
         with conn.cursor() as cursor:
             cursor.execute(query)
 
@@ -58,22 +59,22 @@ def fetch_probeset_query(dataset_name: str):
 
 
 @timer
-def perf_hc_m2_dataset():
+def perf_hc_m2_dataset(sql_uri: str):
     """test the default dataset HC_M2_0606_P"""
 
     dataset_name = "HC_M2_0606_P"
     print(f"Performance test for {dataset_name}")
 
-    query_executor(fetch_probeset_query(dataset_name=dataset_name))
+    query_executor(fetch_probeset_query(dataset_name=dataset_name), sql_uri)
 
 
 @timer
-def perf_umutaffyexon_dataset():
+def perf_umutaffyexon_dataset(sql_uri):
     """largest dataset in gn"""
 
     dataset_name = "UMUTAffyExon_0209_RMA"
     print(f"Performance test for {dataset_name}")
-    query_executor(fetch_probeset_query(dataset_name=dataset_name))
+    query_executor(fetch_probeset_query(dataset_name=dataset_name), sql_uri)
 
 
 def fetch_perf_functions():
@@ -102,6 +103,7 @@ def fetch_cmd_args():
 
 
 if __name__ == '__main__':
+    # Figure out how to pass the database uri here... Maybe use click.
     func_list = fetch_cmd_args()
     for func_obj in func_list:
         func_obj()
-- 
cgit v1.2.3