tina4-python 0.2.65__tar.gz → 0.2.66__tar.gz

{tina4_python-0.2.65 → tina4_python-0.2.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tina4-python
-Version: 0.2.65
+Version: 0.2.66
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com

{tina4_python-0.2.65 → tina4_python-0.2.66}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.2.65"
+version = "0.2.66"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"

{tina4_python-0.2.65 → tina4_python-0.2.66}/tina4_python/Database.py

@@ -223,18 +223,6 @@ class Database:
             return False
         return True
 
-    def check_connected(self):
-        """
-        Checks if the database connection is established
-        :return:
-        """
-        if self.database_engine == self.MYSQL:
-            self.dba.ping(reconnect=True, attempts=1, delay=0)
-        else:
-            # implement other database requirements if needed
-            pass
-
-
     def fetch(self, sql, params=[], limit=10, skip=0):
         """
         Fetch records based on a sql statement
@@ -244,7 +232,6 @@ class Database:
         :param int skip: Offset of records to skip
         :return: DatabaseResult
         """
-        self.check_connected()
         # make a statement to count the records
         sql_count = f"select count(*) as \"count_records\" from ({sql}) as t"
 
@@ -328,7 +315,6 @@ class Database:
         :param list params: A list of params in order of precedence
         :return: DatabaseResult
         """
-        self.check_connected()
         sql = self.parse_place_holders(sql)
         cursor = self.dba.cursor()
         # Running an execute statement and committing any changes to the database
@@ -355,7 +341,6 @@ class Database:
         :param params: A list of params in order of precedence
         :return: DatabaseResult
         """
-        self.check_connected()
         sql = self.parse_place_holders(sql)
         cursor = self.dba.cursor()
         # Running an execute statement and committing any changes to the database
@@ -374,7 +359,6 @@ class Database:
         :return:
         """
         try:
-            self.check_connected()
             if self.database_engine == self.SQLITE:
                 self.dba.execute("BEGIN TRANSACTION")
             elif self.database_engine == self.FIREBIRD:
@@ -442,13 +426,7 @@ class Database:
 
         if isinstance(data, list):
             columns = ", ".join(data[0].keys())
-            # Checking which database engine is used to generate respective syntax for placeholders
-            if self.database_engine in (self.SQLITE, self.FIREBIRD):
-                placeholders = ", ".join(['?'] * len(data[0]))
-            elif self.database_engine in (self.MYSQL, self.POSTGRES):
-                placeholders = ", ".join(['%s'] * len(data[0]))
-            else:
-                placeholders = ", ".join(['?'] * len(data))
+            placeholders = ", ".join(['?'] * len(data[0]))
 
             sql = f"INSERT INTO {table_name} ({columns}) VALUES ({placeholders})"
 
@@ -476,12 +454,7 @@ class Database:
         :param str table_name: Name of table
         :param str filter: Expression for deleting records
         """
-        if self.database_engine in (self.SQLITE, self.FIREBIRD):
-            placeholder = "?"
-        elif self.database_engine in (self.MYSQL, self.POSTGRES):
-            placeholder = "%s"
-        else:
-            placeholder = "?"
+        placeholder = "?"
 
         if filter is not None:
             # Updating a single record - record passed in is a dictionary
@@ -523,12 +496,7 @@ class Database:
         :param None data: List or Dictionary containing the data to be inserted
         :param str primary_key: The name of the primary key of the table
         """
-        if self.database_engine in (self.SQLITE, self.FIREBIRD):
-            placeholder = "?"
-        elif self.database_engine in (self.MYSQL, self.POSTGRES):
-            placeholder = "%s"
-        else:
-            placeholder = "?"
+        placeholder = "?"
 
         if data is not None:
             # Updating a single record - record passed in is a dictionary

{tina4_python-0.2.65 → tina4_python-0.2.66}/tina4_python/ORM.py

@@ -11,6 +11,7 @@ import sys
 import ast
 import json
 import os
+from tina4_python import root_path
 from tina4_python.Constant import TINA4_LOG_ERROR, TINA4_LOG_INFO
 from tina4_python.Debug import Debug
 
@@ -20,8 +21,9 @@ def find_all_sub_classes(a_class):
 
 
 def orm(dba):
+
     Debug("Initializing ORM")
-    orm_path = tina4_python.root_path + os.sep + "src" + os.sep + "orm"
+    orm_path = root_path + os.sep + "src" + os.sep + "orm"
     print("Path", orm_path)
 
     if not os.path.exists(orm_path):
@@ -510,7 +512,7 @@ class ORM:
         if self.__dba__ is not None:
             result = self.__dba__.delete(sql, params)
 
-        if result.error is not None:
+        if not result:
             self.__dba__.rollback()
             return False
         else: