partially working

Author: Antony Bailey

DatabaseConnector.py

@@ -1,9 +1,10 @@
-import MSSQLConnector
-import MariaDBConnector
-import OracleConnector
-import PostgresConnector
+from MSSQLConnector import MSSQLConnector
+from MariaDBConnector import MariaDBConnector
+from OracleConnector import OracleConnector
+from PostgresConnector import PostgresConnector
 from SQLYExecutionError import SQLYExecutionError
-import SQLiteConnector
+from SQLYUtils import SQLYUtils
+from SQLiteConnector import SQLiteConnector
 
 
 class DatabaseConnector:
@@ -51,3 +52,22 @@ def get_connector(db_type, connection):
         if db_type not in connectors:
             raise SQLYExecutionError("Unsupported database type: " + db_type)
         return connectors[db_type](connection)
+
+    def execute_query(self, query: dict, db_type: str, connection: Any):
+        """
+        Executes a SQLY query against a specified database.
+
+        Args:
+            query (dict): The query dictionary"
+            db_type (str): The type of the database (e.g., "sqlite", "mariadb", "postgres", "oracle", "mssql").
+            connection: The connection object or parameters required to establish the database connection.
+
+        Returns:
+            The result of the executed query.
+
+        Raises:
+            SQLYExecutionError: If the query is invalid or an error occurs during execution.
+        """
+        db_connector = DatabaseConnector.get_connector(db_type, connection)
+        sql, params = SQLYUtils.translate_to_sql(query)
+        return db_connector.execute(sql, params)

MSSQLConnector.py

@@ -1,3 +1,4 @@
+import pyodbc
 from BaseDBConnector import BaseDBConnector
 
 
@@ -14,4 +15,19 @@ class MSSQLConnector(BaseDBConnector):
     Methods:
         None
     """
-    pass
+    def __init__(self, connection):
+        """
+        Initializes the MSSQLConnector with a database connection.
+
+        Args:
+            connection (Union[str, pyodbc.Connection]): Either a connection string or a
+                pyodbc Connection object. If a string is provided, it will be used to
+                establish a new connection.
+
+        Notes:
+            If a connection string is provided, it should be in the format required by pyodbc,
+            typically including server, database, authentication details, and other relevant parameters.
+        """
+        if isinstance(connection, str):
+            connection = pyodbc.connect(connection)
+        super().__init__(connection)

MariaDBConnector.py

@@ -1,6 +1,6 @@
+import mysql.connector
 from BaseDBConnector import BaseDBConnector
 
-
 class MariaDBConnector(BaseDBConnector):
     """
     MariaDBConnector is a class that inherits from BaseDBConnector.
@@ -14,4 +14,7 @@ class MariaDBConnector(BaseDBConnector):
     Methods:
         Inherits all methods from BaseDBConnector.
     """
-    pass
+    def __init__(self, connection):
+        if isinstance(connection, str):
+            connection = mysql.connector.connect(connection)
+        super().__init__(connection)

OracleConnector.py

@@ -1,3 +1,4 @@
+import cx_Oracle
 from BaseDBConnector import BaseDBConnector
 
 
@@ -15,4 +16,7 @@ class OracleConnector(BaseDBConnector):
     Methods:
         None
     """
-    pass
+    def __init__(self, connection):
+        if isinstance(connection, str):
+            connection = cx_Oracle.connect(connection)
+        super().__init__(connection)

PostgresConnector.py

@@ -1,6 +1,6 @@
+import psycopg2
 from BaseDBConnector import BaseDBConnector
 
-
 class PostgresConnector(BaseDBConnector):
     """
     PostgresConnector is a class that inherits from BaseDBConnector and serves as a connector to a PostgreSQL database.
@@ -14,4 +14,7 @@ class PostgresConnector(BaseDBConnector):
     Methods:
         None
     """
-    pass
+    def __init__(self, connection):
+        if isinstance(connection, str):
+            connection = psycopg2.connect(connection)
+        super().__init__(connection)

SQLYUtils.py

@@ -48,7 +48,7 @@ def execute_query(query: dict, datasource, db_type):
         Returns:
             The result of the executed query.
         """
-        db_connector = DatabaseConnector.get_connector(db_type, datasource)
+        db_connector = DatabaseConnector.DatabaseConnector(db_type, datasource)
         return db_connector.execute_query(query)
 
     @staticmethod

SQLiteConnector.py

@@ -1,6 +1,6 @@
+import sqlite3
 from BaseDBConnector import BaseDBConnector
 
-
 class SQLiteConnector(BaseDBConnector):
     """
     SQLiteConnector is a class that inherits from BaseDBConnector.
@@ -15,4 +15,7 @@ class SQLiteConnector(BaseDBConnector):
     Methods:
         None
     """
-    pass
+    def __init__(self, connection):
+        if isinstance(connection, str):
+            connection = sqlite3.connect(connection)
+        super().__init__(connection)

__init__.py

@@ -1,5 +1,15 @@
 from SQLYParser import SQLYParser
 from SQLYExecutor import SQLYExecutor
 from SQLYError import SQLYError
+from SQLYParseError import SQLYParseError
+from SQLYExecutionError import SQLYExecutionError
+from SQLiteConnector import SQLiteConnector
+from MariaDBConnector import MariaDBConnector
+from PostgresConnector import PostgresConnector
+from OracleConnector import OracleConnector
+from MSSQLConnector import MSSQLConnector
 
-__all__ = ["SQLYParser", "SQLYExecutor", "SQLYError"]
+__all__ = [
+    "SQLYParser", "SQLYExecutor", "SQLYError", "SQLYParseError", "SQLYExecutionError",
+    "SQLiteConnector", "MariaDBConnector", "PostgresConnector", "OracleConnector", "MSSQLConnector"
+]