tina4-python 0.2.128__tar.gz → 0.2.130__tar.gz

{tina4_python-0.2.128 → tina4_python-0.2.130}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.128
+Version: 0.2.130
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.128 → tina4_python-0.2.130}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.128"
+version = "0.2.130"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.128 → tina4_python-0.2.130}/tina4_python/CRUD.py

@@ -23,6 +23,7 @@ class CRUD:
         self.total_count = 0
         self.sql = None
         self.error = ""
+        self.table_name = None
 
     def strip_sql_pagination(self, sql: str) -> str:
         """
@@ -110,6 +111,10 @@ class CRUD:
         :param query:
         :return:
         """
+
+        if self.table_name is not None:
+            return self.table_name
+
         # Remove LIMIT and everything after
         query = re.sub(r'\s+LIMIT\s+.*$', '', query, flags=re.I)
         # Find the innermost FROM table (non-subquery)
@@ -142,6 +147,10 @@ class CRUD:
 
     def to_crud(self, request, options=None):
         table_name = self.get_table_name(self.sql)
+
+        if table_name is not None and self.table_name is None:
+            self.table_name = table_name
+
         table_nice_name = Template.get_nice_label(table_name)
 
         if options is None:

{tina4_python-0.2.128 → tina4_python-0.2.130}/tina4_python/Database.py

@@ -289,11 +289,15 @@ class Database:
                             cols.append(name)
 
             if cols:
-                like_op = "ILIKE" if self.database_engine == "POSTGRES" else "LIKE"
+                if self.database_engine == "POSTGRES":
+                    like_op = "LIKE"
+                else:
+                    like_op = "LIKE"
+
                 conditions = []
                 for col in cols:
                     col_name = f'"{col}"' if " " not in col else col
-                    conditions.append(f"{col_name} {like_op} ?")
+                    conditions.append(f"cast({col_name} as varchar(1000)) {like_op} ?")
                     final_params.append(f"%{search}%")
 
                 where_clause = " WHERE (" + " OR ".join(conditions) + ")"