berryworld 1.0.0.192676__py3-none-any.whl → 1.0.0.192758__py3-none-any.whl

berryworld/sql_connenction.py

@@ -9,8 +9,6 @@ import sqlalchemy as sa
 from urllib import parse
 from numbers import Number
 
-from lief import exception
-
 
 class SQLConnection:
     """ Connect to Microsoft SQL """
@@ -96,8 +94,8 @@ class SQLConnection:
         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')
+        user_name = os.environ.get("SQL-" + self.db_reference.upper() + '-USERNAME')
+        password = os.environ.get("SQL-" + self.db_reference.upper() + '-PASSWORD')
 
         return re.sub(r'(\\)\1*', r'\1', server_name), db_name, user_name, password
 
@@ -111,16 +109,17 @@ class SQLConnection:
             database = str(self.db_name).lower().replace('primary;', '')
 
         if self.master:
-            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/master' +
+            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/master' +
                               '?driver=' + self.driver + '&trusted_connection=yes' + self.trusted_certificate +
                                self.encrypt)
             self.engine = sa.create_engine(self.con_string % parse.quote_plus(self.password))
         else:
-            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/' + database +
+            self.con_string = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/' + database +
                               '?driver=' + self.driver + self.trusted_certificate + self.encrypt)
             self.engine = sa.create_engine(self.con_string % parse.quote_plus(self.password))
         if not commit_as_transaction:
             self.engine = self.engine.execution_options(isolation_level="AUTOCOMMIT")
+
         self.con = self.engine.connect().connection
 
     def open_write_connection(self, commit_as_transaction=True):
@@ -128,7 +127,7 @@ class SQLConnection:
         :param commit_as_transaction: Indicate whether the connection will be done using the autocommit option or not
         :return: The opened connection
         """
-        constring = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/' + self.db_name +
+        constring = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/' + self.db_name +
                     '?driver=' + self.driver + self.trusted_certificate + self.encrypt)
         self.engine = sa.create_engine(constring % parse.quote_plus(self.password))
         if not commit_as_transaction:

{berryworld-1.0.0.192676.dist-info → berryworld-1.0.0.192758.dist-info}/METADATA

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

{berryworld-1.0.0.192676.dist-info → berryworld-1.0.0.192758.dist-info}/RECORD

@@ -19,19 +19,19 @@ berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,
 berryworld/sharepoint_con.py,sha256=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
 berryworld/snowflake_conn.py,sha256=go5ZJjnhz5SkG83B0G0XZSwKgU6tg7AFTBso59oRG5M,2434
 berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
-berryworld/sql_connenction.py,sha256=CsenHXXe1fSKOgXI5vAdWLmFMkiAnfXAaOVjFD3UMtk,48361
+berryworld/sql_connenction.py,sha256=iFGQHs3QQ7jnLwmhPpnFqI7DFHHE5UuWCfq_QW3SM7U,48349
 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.192676.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.192758.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.192676.dist-info/METADATA,sha256=qBhrjmW4Enunr7bxkhNmYgY6bKAYYVpC0V-Vomoj6kc,1362
-berryworld-1.0.0.192676.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.192676.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.192676.dist-info/RECORD,,
+berryworld-1.0.0.192758.dist-info/METADATA,sha256=CyDlnVUS7BBXo7cx-l3P5RvwPfwd2s98zQRMNTn0RxU,1362
+berryworld-1.0.0.192758.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.192758.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.192758.dist-info/RECORD,,