DE-Lib 0.0.40__py3-none-any.whl → 0.0.42__py3-none-any.whl

DE_Lib/DataBase/MsSql.py

@@ -1,4 +1,5 @@
 import pymssql as mssql
+import json
 
 from DE_Lib.Utils import Generic
 
@@ -12,7 +13,7 @@ class MSSQL:
         self.__database_error = None
 
     def Connect(self, string_connect: dict):
-        msg, conn = None, None
+        msg, conn, result = None, None, None
         try:
             # Efetuando a conexao com a instancia do BANCO
             conn = mssql.connect(user=string_connect["username"], password=string_connect["password"], database=string_connect["instance"], server=string_connect["host"])
@@ -42,4 +43,4 @@ class MSSQL:
 
     @property
     def DATABASE_ERROR(self):
-        return self._DATABASE_ERROR
+        return self.__database_error

DE_Lib/DataBase/Oracle.py

@@ -2,6 +2,7 @@ import os
 import cx_Oracle as ora
 import oracledb as odb
 import sqlalchemy as sqa
+from sqlalchemy import create_engine, text
 import json
 
 from DE_Lib.Utils import Generic
@@ -71,7 +72,8 @@ class ORACLE:
                     __driver = conn["driver_library"].lower()
                 conn_cnn = f"""{conn["database"].lower()}+{__driver}://{conn["username"]}:{conn["password"]}@{__dnsName}"""
                 __engine = sqa.create_engine(conn_cnn)
-                __conn = __engine.connect().connection
+                with __engine.connect() as connection:
+                    __conn = connection.execute(text("select 1 from dual"))
             elif conn["driver_conexao"].upper() == "CX_ORACLE":
                 __conn = ora.connect(conn["username"], conn["password"], __dnsName, threaded=True)
             elif conn["driver_conexao"].upper() == "ORACLEDB" or conn  is None:
@@ -88,9 +90,12 @@ class ORACLE:
             #endregion
         except Exception as error:
             msg = f"""{json.dumps(conn, indent=4).replace(conn["password"], "******")}\nFalha ao tentar se conectar com o banco de dados ORACLE (SqlAlchemy)\nException Error: {error} """
-            self._connection_is_valid = False
+            self.__cnn = msg
+            self.__connection_is_valid = False
             self.__database_error = msg
+            self.__database_driver = conn["driver_conexao"]
             result = self._connection_is_valid
+            self.__nome_database = gen.nvl(conn["database"], "")
         finally:
             return result
 
@@ -166,16 +171,20 @@ class ORACLE:
             dnsName = string_connect["instance"]
             str_cnn = f"""{database.lower()}{driver}://{user}:{pwd}@{dnsName}"""
             engine = sqa.create_engine(str_cnn)
-            result = engine.connect()
-            self._connection_is_valid = True
-            self._cnn = result
-            self.__database_error = f"""{json.dumps(string_connect, indent=4).replace(string_connect["password"], "******")}\nConexao bem sucedida!"""
-            self._nome_database = gen.nvl(string_connect["database"], "")
+            with engine.connect() as connection:
+                result = connection.execute(text("Select 1 from dual"))
+                #result = engine.connect()
+                self._connection_is_valid = True
+                self._cnn = result
+                self.__database_error = f"""{json.dumps(string_connect, indent=4).replace(string_connect["password"], "******")}\nConexao bem sucedida!"""
+                self._nome_database = gen.nvl(string_connect["database"], "")
         except Exception as error:
             msg = f"""{json.dumps(string_connect, indent=4).replace(string_connect["password"], "******")}\nFalha ao tentar se conectar com o banco de dados ORACLE (SqlAlchemy)\nException Error: {error} """
-            result = msg
             self._connection_is_valid = False
             self.__database_error = msg
+            self._cnn = False
+            self._nome_database = gen.nvl(string_connect["database"], "")
+            result = self._cnn
         finally:
             return result
     #endregion

DE_Lib/DataBase/SQLite.py

@@ -18,6 +18,7 @@ class SQLITE:
         msg, result = None, True
         try:
             __file = os.path.join(conn["host"], conn["instance"])
+            __con = ""
             if os.path.isfile(__file):
                 if "check_same_thread" in kwargs.keys():
                     __check_same_thread = kwargs.get("check_same_thread")
@@ -31,7 +32,7 @@ class SQLITE:
                     engine = sqa.create_engine(f"""sqlite:///{__file}""")
                     __conn = engine.connect()
                 else:
-                    ...
+                    __conn = ""
                     # driver nativo sqlite
 
             self._connection_is_valid = True
@@ -39,11 +40,14 @@ class SQLITE:
             self._nome_database = gen.nvl(conn["database"], "SQLite")
             self.__database_driver = conn["driver_conexao"]
             self.__database_error = result
+            result= self._cnn
         except Exception as error:
             msg = f"""{json.dumps(conn, indent=4).replace(conn["password"], "******")}\nFalha ao tentar se conectar com o banco de dados SQLite\nException Error: {error} """
             result = msg
             self._connection_is_valid = False
             self.__database_error = msg
+            self._nome_database = gen.nvl(conn["database"], "SQLite")
+            self.__database_driver = conn["driver_conexao"]
         finally:
             return result
 

{de_lib-0.0.40.dist-info → de_lib-0.0.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DE_Lib
-Version: 0.0.40
+Version: 0.0.42
 Summary: Biblioteca de funcionalidades
 Home-page: https://github.com/DE-DataEng/DE_Lib.git
 Author: Almir J Gomes

{de_lib-0.0.40.dist-info → de_lib-0.0.42.dist-info}/RECORD

@@ -5,14 +5,14 @@ DE_Lib/DataBase/Cache.py,sha256=IpTJCVCrtm8Et4U-_AaWoT_2vf7mBqdzYrWDXbpOORE,3171
 DE_Lib/DataBase/Firebird.py,sha256=dXjt3ImVtdiW99NAHcDIzZhGHF_YIyn4RJbM2QR4g7s,1898
 DE_Lib/DataBase/Informix.py,sha256=jXqPggYu8PjGrqtxMHwlCsqF5rK03olas5yVMH0Ndkw,1559
 DE_Lib/DataBase/Metadata.py,sha256=j0iJm26Sf0QvsYpN61hfwkllyW2EOA2XoFnSzEo9plE,3274
-DE_Lib/DataBase/MsSql.py,sha256=tVx7fdFkw1ZNhfjqw-KuyHtT-hqJ9ZNCR2iU_ogSUVk,1640
+DE_Lib/DataBase/MsSql.py,sha256=eszkLLtRwhZq0IPkApiBTjYqcs1hqwPizC8wfpC6Vrk,1668
 DE_Lib/DataBase/MySql.py,sha256=SWLJMaB30EBqaz32xwMBbc3lnemDPpF2kkkf5umlL3k,2534
-DE_Lib/DataBase/Oracle.py,sha256=n9ub6J6zNX4z62pUWjut3PGxXzLDZQ9jVhZ6eGzFPEw,9704
+DE_Lib/DataBase/Oracle.py,sha256=EHZckkiMXZyQvMHAoPg-IoupSW4GvjOJsxnu-xRr3_Q,10239
 DE_Lib/DataBase/OracleDDL.py,sha256=8PDTjR52Igtj-FyPQvFUBRjTlXB7crMNB8Xh5LncB_Q,3785
 DE_Lib/DataBase/Postgres.py,sha256=lMb6sFGvjjuuq4D4k7zzEo7-NtyrC79VITeKQfoDO6U,1667
 DE_Lib/DataBase/RedShift.py,sha256=ewPi8hxEhfuekBpMl-P1LWgSGfbqPKRpXfjtduCwOKc,1736
 DE_Lib/DataBase/SQCipher.py,sha256=Bw7nq4tQdhM7ux0INF9PUymsIIjBEwMKcA1Un8orCE8,1625
-DE_Lib/DataBase/SQLite.py,sha256=_KScVOmF-dZGQDGVYTUkmXJdsJJDzR8VORH50HBaCLA,2342
+DE_Lib/DataBase/SQLite.py,sha256=RBPcdi-0rKNQsznNv93jwseZKwFD3x5Hhk15-bYG53E,2537
 DE_Lib/DataBase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DE_Lib/Files/Avro.py,sha256=hVXwoOSESHzWROBNYSDOu4myIrcRqSiPqGLRA40vJAk,527
 DE_Lib/Files/Csv.py,sha256=8mpD2g4Ej2RHQvxMODEpBDbxMV5pWJ8dJHyO8YZchuk,2430
@@ -42,8 +42,8 @@ DE_Lib/Utils/Cipher/Gcm.py,sha256=fOuCVOyd4sGv389E91yqomujKTtFZu6CyhySrmQKVfY,23
 DE_Lib/Utils/Cipher/Pbkdf2.py,sha256=hRkgf0Fo5hV1gLbWlFGFzhYYUjPEqgpB2R-pPw7N2F8,1210
 DE_Lib/Utils/Cipher/Rsa.py,sha256=MYG1YsGuq-Q-MoF6pmeMD0TyxMTwt6tuUaLvXcmzQ2k,4126
 DE_Lib/Utils/Cipher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-de_lib-0.0.40.dist-info/licenses/LICENCE,sha256=Qv2ilebwoUtMJnRsZwRy729xS5JZQzLauJ0tQzkAkTA,1088
-de_lib-0.0.40.dist-info/METADATA,sha256=Du9jlp1HLLybgRkVMeLJu9VhpfqGt08VgTvlnMYbkR8,2315
-de_lib-0.0.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-de_lib-0.0.40.dist-info/top_level.txt,sha256=yI9fdM_jkhCz_sykPZQbfeUbQ1FRMt-xjv9fJ6YZVLE,7
-de_lib-0.0.40.dist-info/RECORD,,
+de_lib-0.0.42.dist-info/licenses/LICENCE,sha256=Qv2ilebwoUtMJnRsZwRy729xS5JZQzLauJ0tQzkAkTA,1088
+de_lib-0.0.42.dist-info/METADATA,sha256=DtJG-E84BooMce_631pF03EKJ-k2dO4b67_HmBacz6E,2315
+de_lib-0.0.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+de_lib-0.0.42.dist-info/top_level.txt,sha256=yI9fdM_jkhCz_sykPZQbfeUbQ1FRMt-xjv9fJ6YZVLE,7
+de_lib-0.0.42.dist-info/RECORD,,