- no default database user anymore; it was confusing in connection with password entry

- disable editing host, port, user, and password field if SQLite selected

Author: thorstenkampe

sql shell.exe

@@ -12,10 +12,10 @@
 }
 
 dbms_defaults   = {
-    'MSSQL':      {'shell': 'mssql-cli', 'shell-windows': 'mssql-cli.bat', 'legacy': 'sqlcmd'},
-    'MySQL':      {'shell': 'mycli', 'legacy': 'mysql'},
-    'Oracle':     {'shell': 'sql', 'shell-windows': 'sql.exe', 'legacy': 'sqlplus'},
-    'PostgreSQL': {'shell': 'pgcli', 'legacy': 'psql'},
+    'MSSQL':      {'shell': 'mssql-cli', 'shell-windows': 'mssql-cli.bat', 'legacy': 'sqlcmd', 'port': 1433},
+    'MySQL':      {'shell': 'mycli', 'legacy': 'mysql', 'port': 3306},
+    'Oracle':     {'shell': 'sql', 'shell-windows': 'sql.exe', 'legacy': 'sqlplus', 'port': 1521},
+    'PostgreSQL': {'shell': 'pgcli', 'legacy': 'psql', 'port': 5432},
     'SQLite':     {'shell': 'litecli', 'legacy': 'sqlite3'}
 }
 
@@ -75,7 +75,7 @@ def create(self):
         self.passwd = self.add(TitlePassword, name='- Password:', value=None, **widget_defaults)
 
     def adjust_widgets(self):
-        # hide all fields except legacy client and database type if DSN selected
+        # hide host, port, database, user, and password field if DSN selected
         for field in self.host, self.port, self.db, self.user, self.passwd:
             field.hidden = self.dsn.value
 
@@ -93,6 +93,10 @@ def adjust_widgets(self):
             # field
             self.dbtype.editable = False
 
+        # disable editing host, port, user, and password field if SQLite selected
+        for field in self.host, self.port, self.user, self.passwd:
+            field.editable = self.dbtype.value != 5  # `5` is SQLite
+
         self.display()
 
     def on_cancel(self):
@@ -104,6 +108,10 @@ def on_ok(self):  # NOSONAR
             notify_confirm('Database type is mandatory!', title='ERROR', editw=True)
             return
 
+        if not (self.user.value or self.dbtype.value == 5):  # `5` is SQLite
+            notify_confirm('User is mandatory!', title='ERROR', editw=True)
+            return
+
         read_config()
         dbtype      = list(dbms_defaults)[self.dbtype.value - 1]
         db_defaults = dbms_defaults[dbtype]
@@ -113,8 +121,8 @@ def on_ok(self):  # NOSONAR
         except KeyError:
             dsn = ''
         host        = self.host.value or 'localhost'
-        port        = self.port.value or tb.defaults['port'].get(dbtype.lower())
-        user        = self.user.value or tb.defaults['db_user'].get(dbtype.lower())
+        port        = self.port.value or db_defaults.get('port')
+        user        = self.user.value
         passwd      = self.passwd.value
         db          = self.db.value
 

sql shell.py

@@ -1,21 +1,5 @@
 import sys, urllib
 
-defaults = {
-    'port':    {
-        'mssql':      1433,
-        'mysql':      3306,
-        'oracle':     1521,
-        'postgresql': 5432
-    },
-
-    'db_user': {
-        'mssql':      'sa',
-        'mysql':      'root',
-        'oracle':     'sys',
-        'postgresql': 'postgres'
-    }
-}
-
 def is_localdb(dsn):
     localdb    = r'(localdb)\mssqllocaldb'
     parsed_url = urllib.parse.urlsplit(dsn)

toolbox.py

@@ -40,7 +40,7 @@ def tunnel(remote_host, remote_port, local_port=0):  # `0` means random port
     try:
         section = config[remote_host]
     except KeyError:
-        # remote host is not in ini file so we don't need a real tunnel
+        # remote host is not in ini file, so we don't need a real tunnel
         tunnel = MockTunnel(
             local_bind_host = remote_host,
             local_bind_port = remote_port