berryworld 1.0.0.194150__py3-none-any.whl → 1.0.0.194154__py3-none-any.whl

berryworld/sql_connenction.py

@@ -13,34 +13,27 @@ from numbers import Number
 class SQLConnection:
     """ Connect to Microsoft SQL """
 
-    def __init__(self, db_reference, server, db_server=None, master=False, trusted_certificate=True, azure=False,
-                 encrypt=True, multi_db=False):
+    def __init__(self, db_reference, server, master=False, trusted_certificate=True, encrypt=True, multi_db=False):
         """ Initialize the class
         It requires the
-        SQL-DBREFERENCE-DBNAME = 'db name'
-        SQL-DBREFERENCE-USERNAME = 'user'
-        SQL-DBREFERENCE-PASSW = 'password'
+        SQL-DBREFERENCE-PROD = 'server_name db_name user password'
         -----------------------------
         db_reference = 'FruitFlow'
         server = 'prod'
-        wincred = True
-        master = False
 
-        con_ = SQLConnection(db_reference, server, wincred, master)
+        con_ = SQLConnection(db_reference, server)
         -----------------------------
         :param db_reference: Database reference to connect to
         :param server: Server to connect to
         :param master: Indicate whether the connection will be done to master or to a specific database
         :param trusted_certificate: Indicate whether the connection will be done using the TrustServerCertificate
-        :param azure: Indicate whether the connection will be done to an Azure SQL database or to an on-premise SQL
         :param encrypt: Indicate whether the connection will use SSL/TLS encryption
         :param multi_db: Indicate whether the connection will be done to a specific database or to multiple databases
         """
         self.db_reference = db_reference.replace("_", "") if "_" in db_reference else db_reference
         self.server = server
-        self.db_server = db_server
         if self.server is None:
-            raise ValueError("Please provide a value for server parameter")
+            raise ValueError("Please provide a value for server type")
 
         self.multi_db = multi_db
         self.master = master
@@ -55,13 +48,10 @@ class SQLConnection:
             self.encrypt = ''
 
         drivers = [driver for driver in pyodbc.drivers() if (bool(re.search(r'\d', driver)))]
-        self.azure = azure
-        self.creds = {}
         try:
             self.server_name, self.db_name, self.user_name, self.password = self.credentials()
-
         except Exception as e:
-            print(f'Cannot find a reference to {self.db_reference} - Error: {str(e)}')
+            raise ValueError(f"Cannot find a reference to {self.db_reference} and {self.server.upper()} server: {str(e)}")
 
         self.con = None
         self.engine = None
@@ -85,21 +75,24 @@ class SQLConnection:
         """ Return the credentials used to connect to the SQL Server
         :return: Dictionary with the credentials used to connect to the SQL Server
         """
-        if self.db_server is not None:
-            server_name = self.db_server
+        server_creds = os.environ.get(f"SQL-{self.db_reference.upper()}-{self.server.upper()}")
+        server_creds = server_creds.split(' ') if server_creds is not None else None
+        if server_creds is None:
+            raise ValueError(f"Credentials not registered for {self.db_reference} on {self.server.upper()} server")
+
+        server_name = server_creds[0]
+        if len(server_creds) > 1:
+            db_name = server_creds[1]
         else:
-            if self.azure:
-                server_name = os.environ.get(f"SQL-{self.server.upper()}")
-            else:
-                server_name = os.environ.get(f"SQL-ONPREM-{self.server.upper()}")
-
-        if os.environ.get("SQL-" + self.db_reference.upper() + '-DBNAME-' + self.server.upper()) is not None:
-            db_name = os.environ.get("SQL-" + self.db_reference.upper() + '-DBNAME-' + self.server.upper())
+            raise ValueError(f"Database name not provided for {self.db_reference} on {self.server.upper()} server")
+        if len(server_creds) > 2:
+            user_name = server_creds[2]
         else:
-            db_name = os.environ.get("SQL-" + self.db_reference.upper() + '-DBNAME')
-
-        user_name = os.environ.get("SQL-" + self.db_reference.upper() + '-USERNAME')
-        password = os.environ.get("SQL-" + self.db_reference.upper() + '-PASSWORD')
+            raise ValueError(f"User name not provided for {self.db_reference} on {self.server.upper()} server")
+        if len(server_creds) > 3:
+            password = server_creds[3]
+        else:
+            raise ValueError(f"Password not provided for {self.db_reference} on {self.server.upper()} server")
 
         return re.sub(r'(\\)\1*', r'\1', server_name), db_name, user_name, password
 

{berryworld-1.0.0.194150.dist-info → berryworld-1.0.0.194154.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.194150
+Version: 1.0.0.194154
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd

{berryworld-1.0.0.194150.dist-info → berryworld-1.0.0.194154.dist-info}/RECORD

@@ -19,19 +19,19 @@ berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,
 berryworld/sharepoint_con.py,sha256=_P9m6OydNbm7tCtdMGfF5KRif2eooCcSW3tKbdYr2R4,22254
 berryworld/snowflake_conn.py,sha256=go5ZJjnhz5SkG83B0G0XZSwKgU6tg7AFTBso59oRG5M,2434
 berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
-berryworld/sql_connenction.py,sha256=qdR2ar9z1cJfSL84kYhvUkzHi7Gc91y9ctGWwFX3Dow,48568
+berryworld/sql_connenction.py,sha256=ku2f4_4JY-X-G9dY7h1eKEkRgZY_Ps-1pC1_1ZvF1ng,48411
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 berryworld/verify_keys.py,sha256=X4Nuz3o0XbRDYofbJGvxIDeN5gfWj19PN7lhO6T3hR8,4356
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
-berryworld-1.0.0.194150.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.194154.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_allocation_config.py,sha256=e12l6fE9U57eSPS35g6ekJ_hol7-RHg89JV60_m1BlE,4633
 tests/test_handy_mix_config.py,sha256=Un56mz9KJmdn4K4OwzHAHLSRzDU1Xv2nFrONNuzOG04,2594
 tests/test_xml_parser.py,sha256=3QTlhFEd6KbK6nRFKZnc35tad6wqukTbe4QrFi8mr_8,859
-berryworld-1.0.0.194150.dist-info/METADATA,sha256=9tjHXUhBt7cDlqa_9c_nD8BygR8htzVNh6WtXFW4XEg,1445
-berryworld-1.0.0.194150.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.194150.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.194150.dist-info/RECORD,,
+berryworld-1.0.0.194154.dist-info/METADATA,sha256=oVL9dT1-1QIGuuJlUqc_5bT0mffgT8UlV21rdc0-YGg,1445
+berryworld-1.0.0.194154.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.194154.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.194154.dist-info/RECORD,,