From a6f70d9492be11ed32707becdceaa85d5081d3ad Mon Sep 17 00:00:00 2001
From: ccppi <ccppi3@kolabnow.ch>
Date: Tue, 18 Jun 2024 12:04:00 +0200
Subject: [PATCH] autochoose WHERE & AND in queryeditline

---
 lib/gui.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/gui.py b/lib/gui.py
index 4fe476c..3bcb8d6 100644
--- a/lib/gui.py
+++ b/lib/gui.py
@@ -33,6 +33,7 @@ class MainWindow(QMainWindow):
         self.customcmd = ''
         self.cmd = ''
         self.setWindowTitle("DB_Inspector")
+        self.isAWhere = False
         
         self.layout = QVBoxLayout()
         self.layout2 = QHBoxLayout()
@@ -123,14 +124,23 @@ class MainWindow(QMainWindow):
             print("cmd canton:", self.cmdCanton)
             
         else:
-            self.cmdCanton = ' '
-            print("disable filter")
+            self.cmdCanton = ''
+            print("disable fil§.ter")
        # self.customSQL(self.cmd)
 
     def queryEditLine(self):
         self.cmd = self.EditQuery.text()
-        print(self.initcmd + self.cmdCanton +self.customcmd + self.cmd)
-        self.customSQL(self.initcmd+ self.cmdCanton + self.customcmd + self.cmd)
+        if self.customcmd or self.cmd: 
+            if self.cmdCanton:
+                self.isAWhere = True
+                connectingstring = " AND "
+            else:
+                self.isAWhere = False
+                connectingstring = " WHERE "
+        else:
+            connectingstring = ' '
+        print(self.initcmd + self.cmdCanton +connectingstring +self.customcmd + self.cmd)
+        self.customSQL(self.initcmd+ self.cmdCanton + connectingstring + self.customcmd + self.cmd)
         addFineFilter("../db/sqlite3.db","filters",self.customcmd + self.cmd)
 
     def cell_clicked(self):
@@ -274,7 +284,7 @@ class QueryWindow(QWidget):
         if self.PApplyView.isChecked():
             self.view = self.CShowViews.currentText()
             print("Selected View:",self.view)
-            window.initcmd = f"""SELECT * FROM '{self.view}'"""
+            window.initcmd = f"""SELECT * FROM '{self.view}' """
             print("window.initcmd:", window.initcmd)
         else:
             window.initcmd = f"""SELECT * FROM jobs as b """