Update naming of db methods

Author: mdmintz

README.md

@@ -630,9 +630,9 @@ def write_data_to_db(self, the_id, the_value, the_url):
     db = DatabaseManager()
     query = """INSERT INTO myTable(the_id,the_value,the_url)
                VALUES (%(the_id)s,%(the_value)s,%(the_url)s)"""
-    db.execute_query_and_close(query, {"the_id":the_id,
-                               "the_value":the_value,
-                               "the_url":the_url})
+    db.execute_query(query, {"the_id":the_id,
+                     "the_value":the_value,
+                     "the_url":the_url})
 ```
 
 Access credentials are stored in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py) for your convenience (you have to add them first).
@@ -650,7 +650,7 @@ def get_delayed_test_data(self, test_address, is_done=0):
                FROM delayed_test_data
                WHERE test_address=%(test_address)s
                AND is_done=%(is_done)s"""
-    data = db.fetchall_query_and_close(query, {"test_address":test_address, "is_done":is_done})
+    data = db.fetchall_query(query, {"test_address":test_address, "is_done":is_done})
     if data:
         return data
     else:

seleniumbase/core/mysql.py

@@ -1,27 +1,25 @@
 """
-Wrapper for MySQL functions to make life easier
-Due to compatibility issues, might only work for Python 2.7 right now
+Wrapper for MySQL DB functions to make life easier.
 """
 
 import time
+from seleniumbase.core import mysql_conf as conf
 
 
 class DatabaseManager():
     """
     This class wraps MySQL database methods for easy use.
-    It connects to the testcase database.
     """
 
     def __init__(self, database_env='test', conf_creds=None):
         """
         Gets database information from mysql_conf.py and creates a connection.
         """
-        from seleniumbase.core import mysql_conf as conf
         import MySQLdb
         db_server, db_user, db_pass, db_schema = \
             conf.APP_CREDS[conf.Apps.TESTCASE_REPOSITORY][database_env]
         retry_count = 3
-        backoff = 1.2  # Time to wait (in seconds) between retries
+        backoff = 1.2  # Time to wait (in seconds) between retries.
         count = 0
         while count < retry_count:
             try:
@@ -38,27 +36,27 @@ def __init__(self, database_env='test', conf_creds=None):
         if retry_count == 3:
             raise Exception("Unable to connect to Database after 3 retries.")
 
-    def fetchall_query_and_close(self, query, values):
+    def query_fetch_all(self, query, values):
         """
-        Executes a query, gets all the values, and closes the connection.
+        Executes a db query, gets all the values, and closes the connection.
         """
         self.cursor.execute(query, values)
         retval = self.cursor.fetchall()
         self.__close_db()
         return retval
 
-    def fetchone_query_and_close(self, query, values):
+    def query_fetch_one(self, query, values):
         """
-        Executes a query, gets the first value, and closes the connection.
+        Executes a db query, gets the first value, and closes the connection.
         """
         self.cursor.execute(query, values)
         retval = self.cursor.fetchone()
         self.__close_db()
         return retval
 
-    def execute_query_and_close(self, query, values):
+    def execute_query(self, query, values):
         """
-        Executes a query and closes the connection.
+        Executes a query to the test_db and closes the connection afterwards.
         """
         retval = self.cursor.execute(query, values)
         self.__close_db()

seleniumbase/core/testcase_manager.py

@@ -16,7 +16,7 @@ def insert_execution_data(self, execution_query_payload):
                    (guid, execution_start, total_execution_time, username)
                    VALUES (%(guid)s,%(execution_start_time)s,
                            %(total_execution_time)s,%(username)s)"""
-        DatabaseManager(self.database_env).execute_query_and_close(
+        DatabaseManager(self.database_env).execute_query(
             query,
             execution_query_payload.get_params())
         return execution_query_payload.guid
@@ -26,7 +26,7 @@ def update_execution_data(self, execution_guid, execution_time):
         query = """UPDATE execution
                    SET total_execution_time=%(execution_time)s
                    WHERE guid=%(execution_guid)s """
-        DatabaseManager(self.database_env).execute_query_and_close(
+        DatabaseManager(self.database_env).execute_query(
             query,
             {"execution_guid": execution_guid,
              "execution_time": execution_time})
@@ -48,7 +48,7 @@ def insert_testcase_data(self, testcase_run_payload):
                               %(retry_count)s,
                               %(message)s,
                               %(stack_trace)s) """
-        DatabaseManager(self.database_env).execute_query_and_close(
+        DatabaseManager(self.database_env).execute_query(
             query, testcase_run_payload.get_params())
 
     def update_testcase_data(self, testcase_payload):
@@ -60,14 +60,14 @@ def update_testcase_data(self, testcase_payload):
                             stack_trace=%(stack_trace)s,
                             message=%(message)s
                             WHERE guid=%(guid)s """
-        DatabaseManager(self.database_env).execute_query_and_close(
+        DatabaseManager(self.database_env).execute_query(
             query, testcase_payload.get_params())
 
     def update_testcase_log_url(self, testcase_payload):
         query = """UPDATE test_run_data
                    SET log_url=%(log_url)s
                    WHERE guid=%(guid)s """
-        DatabaseManager(self.database_env).execute_query_and_close(
+        DatabaseManager(self.database_env).execute_query(
             query, testcase_payload.get_params())
 
 

seleniumbase/fixtures/delayed_data_manager.py

@@ -22,7 +22,7 @@ def get_delayed_test_data(self, test_address, is_done=0):
                    FROM delayed_test_data
                    WHERE test_address=%(test_address)s
                    AND is_done=%(is_done)s"""
-        data = db.fetchall_query_and_close(
+        data = db.query_fetch_all(
             query, {"test_address": test_address,
                     "is_done": is_done})
         if data:
@@ -57,7 +57,7 @@ def insert_delayed_test_data(self, guid_, test_address,
                    VALUES (%(guid)s,%(test_address)s,%(inserted_at)s,
                            %(expected_result)s,%(is_done)s,%(expires_at)s)"""
 
-        db.execute_query_and_close(
+        db.execute_query(
             query, {"guid": guid_,
                     "test_address": test_address,
                     "inserted_at": inserted_at,
@@ -79,7 +79,7 @@ def set_delayed_test_to_done(self, guid_):
                    SET is_done=TRUE
                    WHERE guid=%(guid)s
                    AND is_done=FALSE"""
-        db.execute_query_and_close(query, {"guid": guid_})
+        db.execute_query(query, {"guid": guid_})
         return True