tdfs4ds 0.2.4.25__py3-none-any.whl → 0.2.4.41__py3-none-any.whl

tdfs4ds/utils/query_management.py

@@ -84,71 +84,49 @@ def execute_query_wrapper(f):
     return wrapped_f
 
 
-def execute_query(query):
+def execute_query(query, raise_error=False):
     """
     Execute a SQL query or a list of queries using the tdml module.
 
-    This function checks the version of the tdml module and executes the query or queries accordingly.
-    For versions greater than 17.20.00.03, it uses `tdml.execute_sql`; otherwise, it uses `tdml.get_context().execute`.
-
     Args:
         query (str or list): A single SQL query string or a list of SQL query strings.
+        raise_error (bool): If True, re-raise exceptions after printing them. Default is False.
 
     Returns:
         The result of the SQL execution if a single query is passed. None if a list of queries is passed or an exception occurs.
+    """
+    def handle_exception(e, q):
+        # Always print error
+        print(str(e).split('\n')[0])
+        print(q)
 
-    Example:
-        To execute a single SQL query and retrieve the result:
-        >>> result = execute_query("SELECT * FROM my_table")
-
-        To execute a list of SQL queries:
-        >>> execute_query(["UPDATE table1 SET column1 = 42", "DELETE FROM table2 WHERE condition"])
-
-    Note:
-        - If a single query is passed, the function returns the result of the SQL execution.
-        - If a list of queries is passed, the function executes each query and returns None.
-        - If an exception occurs during execution, the error message and the problematic query are printed,
-          and the function returns None.
+        # Raise exception only if requested
+        if raise_error:
+            raise e
 
-    """
-    # Check if the version of tdml is greater than the specified base version
     if is_version_greater_than(tdml.__version__, base_version="17.20.00.03"):
-        # If query is a list, iterate and execute each query
-        if type(query) == list:
+        if isinstance(query, list):
             for q in query:
                 try:
-                    tdml.execute_sql(q)  # Execute the query
+                    tdml.execute_sql(q)
                 except Exception as e:
-                    # Print the first line of the exception and the query that caused it
-                    print(str(e).split('\n')[0])
-                    print(q)
+                    handle_exception(e, q)
         else:
-            # If query is not a list, execute it and return the result
             try:
                 return tdml.execute_sql(query)
             except Exception as e:
-                # Print the first line of the exception and the query
-                print(str(e).split('\n')[0])
-                print(query)
+                handle_exception(e, query)
     else:
-        # For tdml versions not greater than the specified version
-        if type(query) == list:
+        if isinstance(query, list):
             for q in query:
                 try:
-                    # Use the older execution method for the query
                     tdml.get_context().execute(q)
                 except Exception as e:
-                    # Print the first line of the exception and the query
-                    print(str(e).split('\n')[0])
-                    print(q)
+                    handle_exception(e, q)
         else:
             try:
-                # Execute the single query using the older method and return the result
                 return tdml.get_context().execute(query)
             except Exception as e:
-                # Print the first line of the exception and the query
-                print(str(e).split('\n')[0])
-                print(query)
+                handle_exception(e, query)
 
-    # No return value if a list of queries is executed or if an exception occurs
-    return
+    return None