DE-Lib 0.0.41__tar.gz → 0.0.42__tar.gz

{de_lib-0.0.41 → de_lib-0.0.42}/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-0.0.41 → de_lib-0.0.42}/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
@@ -45,6 +46,8 @@ class SQLITE:
             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.41 → de_lib-0.0.42}/DE_Lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DE_Lib
-Version: 0.0.41
+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.41 → de_lib-0.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DE_Lib
-Version: 0.0.41
+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.41 → de_lib-0.0.42}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name='DE_Lib',
-    version='0.0.41',
+    version='0.0.42',
     author='Almir J Gomes',
     author_email='almir.jg@hotmail.com',
     packages=find_packages(),