q2rad 0.1.200__tar.gz → 0.1.202__tar.gz

{q2rad-0.1.200 → q2rad-0.1.202}/PKG-INFO

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

{q2rad-0.1.200 → q2rad-0.1.202}/pyproject.toml

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

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2actions.py

@@ -18,6 +18,7 @@ from q2gui.q2model import Q2CursorModel
 from q2rad.q2raddb import last_error, insert
 from q2rad.q2utils import q2cursor, choice_form, choice_column, Q2_save_and_run, Q2Form, int_
 from q2gui import q2app
+
 # from q2rad import Q2Form
 
 import gettext
@@ -44,17 +45,9 @@ class Q2Actions(Q2Form, Q2_save_and_run):
         self.add_action("Copy to", icon="❖", worker=self.copy_to)
 
     def create_form(self):
+        from q2rad.q2forms import Q2Forms
+
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
-        self.add_control(
-            "name",
-            _("Form"),
-            disabled="*",
-            to_table="forms",
-            to_column="name",
-            related="name",
-            datatype="char",
-            datalen=100,
-        )
         self.add_control("action_text", _("Action text"), datatype="char", datalen=100)
         self.add_control("/")
         if self.add_control("/t", _("Main"), tag="tab"):
@@ -119,8 +112,22 @@ class Q2Actions(Q2Form, Q2_save_and_run):
                 control="radio",
                 datatype="int",
             )
+            self.add_control("/")
+            self.add_control("/f")
+            self.add_control(
+                "name",
+                _("Form"),
+                # disabled="*",
+                to_table="forms",
+                to_column="name",
+                to_form=Q2Forms(),
+                related="name",
+                datatype="char",
+                datalen=100,
+            )
 
             self.add_control("/s")
+
         self.add_control("/t", _("Action Script"))
         self.add_control(
             "action_worker",
@@ -151,7 +158,8 @@ class Q2Actions(Q2Form, Q2_save_and_run):
             seq = (
                 int_(
                     q2cursor(
-                        f"select max(seq) as maxseq from actions where name='{choice['name']}'", q2app.q2_app.db_logic
+                        f"select max(seq) as maxseq from actions where name='{choice['name']}'",
+                        q2app.q2_app.db_logic,
                     ).r.maxseq
                 )
                 + 1
@@ -159,7 +167,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
             for x in rows:
                 rec = self.model.get_record(x)
                 rec["seq"] = seq
-                rec["name"] = choice['name']
+                rec["name"] = choice["name"]
                 seq += 1
                 if not insert("actions", rec, q2app.q2_app.db_logic):
                     print(last_error(q2app.q2_app.db_logic))
@@ -184,7 +192,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
     def select_child_form(self):
         choice = choice_form()
         if choice:
-            self.s.child_form = choice['name']
+            self.s.child_form = choice["name"]
             if self.s.child_where == "":
                 parent_pk = q2cursor(
                     f"""select column
@@ -199,7 +207,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
         if self.s.child_where.startswith("=") or self.s.child_where == "":
             choice = choice_column(self.s.child_form)
             if choice:
-                self.s.child_where = choice['col'] + self.s.child_where
+                self.s.child_where = choice["col"] + self.s.child_where
 
     def before_form_show(self):
         self.action_mode_valid()

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2appmanager.py

@@ -26,6 +26,16 @@ from datetime import datetime
 import json
 import os
 
+app_tables = [
+    "forms",
+    "lines",
+    "actions",
+    "reports",
+    "modules",
+    "queries",
+    "packages",
+]
+
 
 class AppManager(Q2Form):
     def __init__(self, title=""):
@@ -40,7 +50,6 @@ class AppManager(Q2Form):
                     "upgrade",
                     "Check updates",
                     control="button",
-                    datalen=10,
                     valid=q2app.q2_app.update_packages,
                 )
 
@@ -66,7 +75,6 @@ class AppManager(Q2Form):
                 "reload_assets",
                 "Reload assets",
                 control="button",
-                datalen=10,
                 valid=self.reload_assets,
             )
 
@@ -307,7 +315,7 @@ class AppManager(Q2Form):
         file = self.validate_impexp_file_name(file, filetype)
         if file:
             if app_json is None:
-                app_json = self.get_app_json()
+                app_json = q2working(self.get_app_json, "Prepare data...")
             if app_json:
                 json.dump(app_json, open(file, "w"), indent=1)
 
@@ -315,6 +323,8 @@ class AppManager(Q2Form):
         db: Q2Db = q2app.q2_app.db_logic
         rez = {}
         for x in db.get_tables():
+            if x not in app_tables:
+                continue
             if x.startswith("log_") or x == "sqlite_sequence":
                 continue
             rez[x] = []
@@ -332,18 +342,23 @@ class AppManager(Q2Form):
 
         file = self.validate_impexp_file_name(file, filetype)
         if file:
-            db: Q2Db = q2app.q2_app.db_data
-            rez = {}
-            for x in db.get_tables():
-                if x.startswith("log_") or x == "sqlite_sequence":
-                    continue
-                rez[x] = []
-                for row in db.table(x).records():
-                    rez[x].append(row)
-
+            rez = q2working(self.get_data_json, "Prepare data...")
             if rez:
                 json.dump(rez, open(file, "w"), indent=1)
 
+    def get_data_json(self):
+        db: Q2Db = q2app.q2_app.db_data
+        rez = {}
+        for x in db.get_tables():
+            if x in app_tables:
+                continue
+            if x.startswith("log_") or x == "sqlite_sequence":
+                continue
+            rez[x] = []
+            for row in db.table(x).records():
+                rez[x].append(row)
+        return rez
+
     def import_q2market(self):
         self.q2_app.check_app_update(force_update=True)
 
@@ -373,9 +388,9 @@ class AppManager(Q2Form):
                 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 name not like "\\_%"')
             if db.last_sql_error:
-                print(db.last_sql_error)
+                errors.append(db.last_sql_error)
             for row in data[table]:
                 wait_row.step()
                 if table == "packages":
@@ -384,6 +399,8 @@ class AppManager(Q2Form):
                         == row["package_name"]
                     ):
                         continue
+                if row.get("name", "").startswith("_"):
+                    continue
                 if not db.insert(table, row):
                     errors.append(db.last_sql_error)
                     errors.append(db.last_record)

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2lines.py

@@ -15,7 +15,7 @@
 
 from q2gui.q2model import Q2CursorModel
 from q2rad.q2raddb import Q2Cursor, insert
-from q2gui.q2dialogs import q2AskYN
+from q2gui.q2dialogs import q2AskYN, q2mess
 from q2rad.q2utils import q2cursor, choice_table, choice_column, choice_form, Q2_save_and_run
 from q2rad.q2raddb import last_error
 
@@ -99,19 +99,11 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         self.add_action("Layout|Form", icon="☆", worker=lambda: self.add_layout("/f"))
         self.add_action("Layout|Horizontally", worker=lambda: self.add_layout("/h"))
         self.add_action("Layout|Vertically", worker=lambda: self.add_layout("/v"))
+        self.add_action("Alter column", icon="🔧", worker=self.alter_column)
 
     def create_form(self):
+        from q2rad.q2forms import Q2Forms
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
-        self.add_control(
-            "name",
-            _("Form"),
-            # disabled="*",
-            to_table="forms",
-            to_column="name",
-            related="name",
-            datatype="char",
-            datalen=100,
-        )
         self.add_control("column", _("Column name"), datalen=50)
         self.add_control("/")
         if self.add_control("/t", _("Main")):
@@ -130,7 +122,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                 self.add_control("/")
             if self.add_control("/h"):
                 self.add_control("stretch", _("Stretch factor"), datatype="int")
-                self.add_control("alignment", _("Alignment"), datatype="int",datalen=3)
+                self.add_control("alignment", _("Alignment"), datatype="int", datalen=3)
                 self.add_control("tag", _("Tag"), datatype="char", datalen=100)
                 self.add_control("/")
             if self.add_control("/h", _("Control type")):
@@ -196,7 +188,6 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_table,
                     )
                     self.add_control("to_table", gridlabel=_("To table"), datatype="char", datalen=100)
@@ -207,20 +198,20 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_table_pk,
                     )
                     self.add_control("to_column", gridlabel=_("To field"), datatype="char", datalen=100)
                     self.add_control("/")
                 if self.add_control("/h", _("Data to show")):
+                    self.add_control("/v")
                     self.add_control(
                         "select_column",
                         _("?"),
                         mess=_("Open list of existing columns"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_table_column,
                     )
+                    self.add_control("/")
                     self.add_control(
                         "related", control="codesql", gridlabel=_("Data to show"), datatype="text"
                     )
@@ -231,7 +222,6 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing forms"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_form,
                     )
                     self.add_control("to_form", gridlabel=_("Form to open"), datatype="char", datalen=100)
@@ -239,6 +229,20 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
                 self.add_control("/")
 
+            self.add_control("/f")
+            self.add_control(
+                "name",
+                _("Form"),
+                # disabled="*",
+                to_table="forms",
+                to_column="name",
+                to_form=Q2Forms(),
+                related="name",
+                datatype="char",
+                datalen=100,
+            )
+            self.add_control("/")
+
             self.add_control("/s")
 
         self.add_control("/t", _("Comment"))
@@ -277,6 +281,13 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             self.controls.delete("save_and_run_actions_visible")
         self.system_controls.insert(2, self._save_and_run_control)
 
+    def alter_column(self):
+        if self.r.migrate and q2AskYN(f"Alter column {self.r.column}?") == 2:
+            record = self.get_current_record()
+            record["table"] = self.db.get("forms", f"name = '{self.prev_form.r.name}'", "form_table")
+            if not q2app.q2_app.db_data.alter_column(record):
+                q2mess(self.db_data.migrate_error_list)
+
     def copy_to(self):
         rows = self.get_grid_selected_rows()
         choice = choice_form()
@@ -374,20 +385,21 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         cols = self.q2_app.db_data.db_schema.get_schema_columns(self.prev_form.r.form_table)
         for x in cols:
-            insert(
-                "lines",
-                {
-                    "name": self.prev_form.r.name,
-                    "column": x,
-                    "label": x,
-                    "datatype": cols[x]["datatype"],
-                    "datalen": cols[x]["datalen"],
-                    "pk": cols[x]["pk"],
-                    "ai": cols[x]["ai"],
-                    "migrate": "*",
-                },
-                self.db,
-            )
+            if self.db.get("lines", f"name = '{self.prev_form.r.name}' and column = '{x}'") == {}:
+                insert(
+                    "lines",
+                    {
+                        "name": self.prev_form.r.name,
+                        "column": x,
+                        "label": x,
+                        "datatype": cols[x]["datatype"],
+                        "datalen": cols[x]["datalen"],
+                        "pk": cols[x]["pk"],
+                        "ai": cols[x]["ai"],
+                        "migrate": "*",
+                    },
+                    self.db,
+                )
         self.refresh()
 
     def before_crud_save(self):

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2queries.py

@@ -171,6 +171,7 @@ class Q2QueryEdit(Q2Form):
         self.query_list = Q2QueryList(self)
         self.param_list = Q2ParamList()
         self.actions = Q2Actions()
+        self._db = None
         self.actions.add_action("Run F4", self.query_list.sql_runner, hotkey="F4")
 
         self.actions.show_main_button = 0
@@ -257,7 +258,7 @@ class Q2QueryList(Q2Form):
                 sql = sql.replace(x, f"{value}")
             else:
                 sql = sql.replace(x, f"'{value}'")
-        q2cursor(sql).browse()
+        q2cursor(sql, q2_db=self.query_editor_form._db).browse()
 
     def sql_to_model(self, sql):
         self.model.update({"sql": sql}, self.current_row, refresh=False)
@@ -317,7 +318,6 @@ class Q2ParamList(Q2Form):
         return params
 
     def get_param(self, param):
-        print(self.model.records)
         for x in self.model.records:
             if x["name"] == (param[1:] if param.startswith(":") else param[1:-1]):
                 return x["value"]

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2rad.py

@@ -421,7 +421,6 @@ class Q2RadApp(Q2App):
     def _open_database(self, database_name, db_engine_name, host, port, password, user, guest_mode=None):
         db = None
         first_pass = 0
-
         while True:
             try:
                 db = q2working(
@@ -465,7 +464,8 @@ class Q2RadApp(Q2App):
                         ),
                         mess=_("Creating database"),
                     )
-                except Exception:
+                except Exception as error:
+                    q2mess(f"Error occured while creating the database:<br>{error}")
                     return None
 
     def open_databases(self):
@@ -491,7 +491,7 @@ class Q2RadApp(Q2App):
         self.last_root_password = ""
         if self.db_data is None or self.db_logic is None:
             self.selected_application = {}
-            q2Mess(_("Can not open database"))
+            # q2Mess(_("Can not open database"))
             self.open_application()
 
     def create_menu(self):
@@ -799,7 +799,7 @@ class Q2RadApp(Q2App):
                 f" {_source_suffix}{package}{_source_postfix}"
             )
             if trm.exit_code != 0:
-                q2mess(f"Error occured while updateing <b>{package}</b>! See output for details.")
+                q2mess(f"Error occured while updating <b>{package}</b>! See output for details.")
         w.close()
         q2Mess("Finished!<p>The program will be restarted!")
         self.restart()

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2stylesettings.py

@@ -114,8 +114,8 @@ class AppStyleSettings(Q2Form):
         self.q2_app.set_color_mode(color_mode)
 
     def font_size_valid(self):
-        if int_(self.s.font_size) < 8:
-            self.s.font_size = 8
+        if int_(self.s.font_size) < 10:
+            self.s.font_size = 10
         if self.s.apply:
             self.q2_app.q2style.font_size = int_(self.s.font_size)
             self.style_valid()

{q2rad-0.1.200 → q2rad-0.1.202}/q2rad/q2utils.py

@@ -217,7 +217,8 @@ class Q2Form(_Q2Form):
                 f"""select *
                         from log_{self.model.get_table_name()}
                         where {pk} = '{self.r.__getattr__(pk)}'
-                    """
+                    """,
+                q2_db=self.db,
             )
         elif choice == 3:
             where = self.model.get_where()
@@ -226,7 +227,8 @@ class Q2Form(_Q2Form):
                 f"""select *
                         from log_{self.model.get_table_name()}
                         {where}
-                    """
+                    """,
+                self.db,
             )
         form = Q2Form(f"Changelog ({self.title})")
         form.add_control("/")
@@ -263,6 +265,7 @@ class Q2Form(_Q2Form):
             from q2rad.q2queries import Q2QueryEdit
 
             form.query_edit = Q2QueryEdit()
+            form.query_edit._db = self.db
             form.add_control("ql", "", widget=form.query_edit, nogrid=1, migrate=0)
 
             def after_form_show():
@@ -282,10 +285,10 @@ class Q2Form(_Q2Form):
 
 
 class q2cursor(Q2Cursor):
-    def __init__(self, sql="", q2_db=None):
+    def __init__(self, sql="", q2_db=None, data=[]):
         if q2_db is None:
             q2_db = q2app.q2_app.db_data
-        super().__init__(q2_db, sql)
+        super().__init__(q2_db, sql, data=data)
         if q2_db.last_sql_error:
             print(q2_db.last_sql_error)
 

q2rad-0.1.202/q2rad/version.py

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

q2rad-0.1.200/q2rad/version.py

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