berryworld 1.0.0.194581__py3-none-any.whl → 1.0.0.194660__py3-none-any.whl

berryworld/__init__.py

@@ -9,7 +9,7 @@ from .credentials import SnowflakeCredentials, SQLCredentials, BCCredentials, We
     MicrosoftTeamsCredentials
 from .persistent_storage import PersistentStorage
 from .generate_env import EnvVariables
-from .sharepoint_con import SharepointConnection
+from .sharepoint_con import SharepointConnection, SharepointConn
 from .email_con import EmailConnection
 from .app_logs import AppLogs
 from .app_logs_query import AppLogsQuery

berryworld/sql_connenction.py

@@ -101,17 +101,13 @@ class SQLConnection:
         :param commit_as_transaction: Indicate whether the connection will be done using the autocommit option or not
         :return: The opened connection
         """
-        database = self.db_name
-        if self.multi_db:
-            database = str(self.db_name).lower().replace('primary;', '')
-
         if self.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_name + '/' + database +
+            self.con_string = ('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(self.con_string % parse.quote_plus(self.password))
         if not commit_as_transaction:
@@ -124,7 +120,11 @@ 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_name + '/' + self.db_name +
+        database = self.db_name
+        if self.multi_db:
+            database = str(self.db_name) + 'Primary'
+
+        constring = ('mssql+pyodbc://' + self.user_name + ':%s@' + self.server_name + '/' + database +
                     '?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.194581.dist-info → berryworld-1.0.0.194660.dist-info}/METADATA

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

{berryworld-1.0.0.194581.dist-info → berryworld-1.0.0.194660.dist-info}/RECORD

@@ -1,4 +1,4 @@
-berryworld/__init__.py,sha256=UEj9fbma07Y_b75dJIYMHcalwYuW7a5h7dxxb6mTINI,1124
+berryworld/__init__.py,sha256=x0BONOWraAH1SG_BRHWpZNarRMUqoRHKkdASKMtAdhc,1140
 berryworld/aks_logs.py,sha256=Gb2_cokiZbEX01Yoptd0MxpDociaug-GrXdwliyxFBo,2293
 berryworld/allocation_solver.py,sha256=asFtaCAze6-eHUGWXA0kAp67UBS-Upj1KKdrVLj_ttQ,8513
 berryworld/app_logs.py,sha256=MKzKPYd3JuPfOQNAapIgaeZeFHw1z_w2mbn9I6QCADE,4180
@@ -19,19 +19,19 @@ berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,
 berryworld/sharepoint_con.py,sha256=DSGiS1J_c2PHtGNaC6XkgY8WAFU3KMD6Wx-d723XOHU,44522
 berryworld/snowflake_conn.py,sha256=hhh8pxN3TSg3baJ61olC_oEROSE-yp3MKsG50llLglc,2708
 berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
-berryworld/sql_connenction.py,sha256=ku2f4_4JY-X-G9dY7h1eKEkRgZY_Ps-1pC1_1ZvF1ng,48411
+berryworld/sql_connenction.py,sha256=2EaTdh6JL1j1PzLl5MmbkxpZ1OtvdyqX6h0M_G8CuRQ,48391
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 berryworld/verify_keys.py,sha256=X7VUHqYDklWPDO0bGVHIOXeLq5Qi4fZRZbHYw5x7UnA,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.194581.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.194660.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.194581.dist-info/METADATA,sha256=_-Tqh0HoOA7Mj4tJtgVegM5F36GYm8EvLbxZOAjpjD4,1445
-berryworld-1.0.0.194581.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.194581.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.194581.dist-info/RECORD,,
+berryworld-1.0.0.194660.dist-info/METADATA,sha256=zVtHqYXJfdwsrKnbtwRafnVIN_RVjIYaLqbcgWWRgok,1445
+berryworld-1.0.0.194660.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.194660.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.194660.dist-info/RECORD,,