tina4-python 0.2.127__tar.gz → 0.2.129__tar.gz

{tina4_python-0.2.127 → tina4_python-0.2.129}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.127
+Version: 0.2.129
 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.127 → tina4_python-0.2.129}/pyproject.toml

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

{tina4_python-0.2.127 → tina4_python-0.2.129}/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,8 +147,11 @@ 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)
-        twig_file = self.ensure_crud_template(table_name + ".twig")
 
         if options is None:
             options = {}
@@ -163,6 +171,13 @@ class CRUD:
         if "search_columns" in options:
             self.search_columns = options["search_columns"]
 
+        crud_name = table_name
+        if "name" in options:
+            crud_name = options["name"]
+
+        twig_file = self.ensure_crud_template(crud_name + ".twig")
+
+
         async def get_record(request, response):
             limit = int(request.params.get("limit", options.get("limit", 10)))
             offset = int(request.params.get("offset", options.get("offset", 0)))
@@ -213,18 +228,19 @@ class CRUD:
             self.dba.commit()
             return response({"message": f"<script>showMessage('{table_nice_name}  Record deleted');</script>"}, HTTP_OK, APPLICATION_JSON)
 
-        Router.add(TINA4_GET, os.path.join(request.url, table_name).replace("\\", "/"), get_record)
-        Router.add(TINA4_POST, os.path.join(request.url, table_name).replace("\\", "/"), post_record)
-        Router.add(TINA4_POST, os.path.join(request.url, table_name, "{"+options["primary_key"]+"}").replace("\\", "/"), update_record)
-        Router.add(TINA4_DELETE, os.path.join(request.url, table_name, "{"+options["primary_key"]+"}").replace("\\", "/"), delete_record)
+        Router.add(TINA4_GET, os.path.join(request.url, crud_name).replace("\\", "/"), get_record)
+        Router.add(TINA4_POST, os.path.join(request.url, crud_name).replace("\\", "/"), post_record)
+        Router.add(TINA4_POST, os.path.join(request.url, crud_name, "{"+options["primary_key"]+"}").replace("\\", "/"), update_record)
+        Router.add(TINA4_DELETE, os.path.join(request.url, crud_name, "{"+options["primary_key"]+"}").replace("\\", "/"), delete_record)
 
         fields = []
         for column in self.columns:
             fields.append({"name": column, "label": Template.get_nice_label(column)})
 
+
         html = Template.render(twig_file.replace(os.path.join(tina4_python.root_path, "src", "templates"), "").replace("\\", "/"),
                                {"columns": fields, "records": self.to_array(),
-                                "table_name": table_name,
+                                "table_name": crud_name,
                                 "total_records": self.total_count,
                                 "options": options})