q2rad 0.1.211__tar.gz → 0.1.213__tar.gz

{q2rad-0.1.211 → q2rad-0.1.213}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.211
+Version: 0.1.213
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de

{q2rad-0.1.211 → q2rad-0.1.213}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "q2rad"
-version = "0.1.211"
+version = "0.1.213"
 description = "RAD - database, GUI, reports"
 authors = ["Andrei Puchko <andrei.puchko@gmx.de>"]
 readme = "README.md"

{q2rad-0.1.211 → q2rad-0.1.213}/q2rad/q2appmanager.py

@@ -446,13 +446,14 @@ class AppManager(Q2Form):
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
         errors = []
+        db.transaction()
         for table in data:
             wait_table.step(table)
             if table not in db_tables:
                 continue
             wait_row = Q2WaitShow(len(data[table]))
             if table != "packages":
-                db.cursor(f'delete from `{table}` where name not like "\\_%"')
+                db.cursor(f'delete from `{table}` where substr(name,1,1) <> "_"')
             if db.last_sql_error:
                 errors.append(db.last_sql_error)
             for row in data[table]:
@@ -469,6 +470,7 @@ class AppManager(Q2Form):
                     errors.append(db.last_sql_error)
                     errors.append(db.last_record)
             wait_row.close()
+        db.commit()
         wait_table.close()
         if errors:
             q2Mess("<br>".join(errors))
@@ -491,6 +493,7 @@ class AppManager(Q2Form):
         db: Q2Db = q2app.q2_app.db_data
         db_tables = db.get_tables()
         wait_table = Q2WaitShow(len(data))
+        db.transaction()
         errors = []
         for table in data:
             wait_table.step(table)
@@ -506,6 +509,7 @@ class AppManager(Q2Form):
                     errors.append(db.last_sql_error)
                     # print(db.last_sql_error)
             wait_row.close()
+        db.commit()
         wait_table.close()
         if errors:
             q2Mess("<br>".join(errors))

{q2rad-0.1.211 → q2rad-0.1.213}/q2rad/q2modules.py

@@ -16,6 +16,7 @@
 from q2db.cursor import Q2Cursor
 from q2gui.q2model import Q2CursorModel
 from q2gui.q2dialogs import q2AskYN
+from q2gui import q2app
 from q2rad.q2utils import Q2Form
 from q2rad.q2utils import Q2_save_and_run
 from q2gui.q2utils import num
@@ -34,6 +35,7 @@ class Q2Modules(Q2Form, Q2_save_and_run):
 
     def on_init(self):
         self.editor_actions = Q2Actions()
+        self.db = q2app.q2_app.db_logic
         self.add_control(
             "name",
             _("Name"),

{q2rad-0.1.211 → q2rad-0.1.213}/q2rad/q2packages.py

@@ -18,6 +18,7 @@ from q2gui.q2model import Q2CursorModel
 from q2gui.q2dialogs import q2Mess, q2AskYN
 
 from q2rad.q2utils import Q2Form
+from q2gui import q2app
 import gettext
 
 
@@ -30,6 +31,7 @@ class Q2Packages(Q2Form):
         self.no_view_action = True
 
     def on_init(self):
+        self.db = q2app.q2_app.db_logic
         self.add_control("package_name", _("Name"), datatype="char", datalen=100, pk="*")
         self.add_control("package_pipname", _("Pip name"), datatype="char", datalen=100)
         self.add_control("package_version", _("Version"), datatype="char", datalen=10)

{q2rad-0.1.211 → q2rad-0.1.213}/q2rad/q2queries.py

@@ -23,6 +23,7 @@ import json
 import gettext
 import re
 from q2rad.q2utils import Q2Form
+from q2gui import q2app
 
 _ = gettext.gettext
 re_find_param = re.compile(r"(?::\b\w+\b|\{.+\})")
@@ -35,6 +36,7 @@ class Q2Queries(Q2Form, Q2_save_and_run):
 
     def on_init(self):
         self.create_form()
+        self.db = q2app.q2_app.db_logic
 
         cursor: Q2Cursor = self.q2_app.db_logic.table(table_name="queries")
         model = Q2CursorModel(cursor)

{q2rad-0.1.211 → q2rad-0.1.213}/q2rad/q2reports.py

@@ -218,6 +218,7 @@ class Q2Reports(Q2Form, Q2_save_and_run):
 
     def on_init(self):
         self.report_edit_form = None
+        self.db = q2app.q2_app.db_logic
 
         self.add_control("name", _("Name"), datatype="char", datalen=100, pk="*")
         self.add_control("/")

{q2rad-0.1.211 → q2rad-0.1.213}/q2rad/q2utils.py

@@ -233,6 +233,7 @@ class Q2Form(_Q2Form):
                 self.db,
             )
         form = Q2Form(f"Changelog ({self.title})")
+        form.db = self.db
         form.add_control("/")
         form.add_control("/h", "-")
         form.add_control("q2_mode", "Mode", datalen=3)
@@ -290,12 +291,14 @@ class q2cursor(Q2Cursor):
     def __init__(self, sql="", q2_db=None, data=[]):
         if q2_db is None:
             q2_db = q2app.q2_app.db_data
+        self._q2_db = q2_db
         super().__init__(q2_db, sql, data=data)
         if q2_db.last_sql_error:
             print(q2_db.last_sql_error)
 
     def q2form(self):
         form = Q2Form(self.sql)
+        form.db = self._q2_db
         for x in self.record(0):
             form.add_control(x, x, datalen=250)
         form.set_model(Q2CursorModel(self))

q2rad-0.1.213/q2rad/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.213"

q2rad-0.1.211/q2rad/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.211"