From 6b8593a09b6340e902f2522ac0eaf4fb0357e7bd Mon Sep 17 00:00:00 2001
From: jesopo
Date: Mon, 5 Nov 2018 18:23:02 +0000
Subject: Pass connection parameters around in their own object
 (IRCConnectionParameters)

---
 src/Database.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/Database.py')

diff --git a/src/Database.py b/src/Database.py
index 77e83fdc..8dcf42ec 100644
--- a/src/Database.py
+++ b/src/Database.py
@@ -12,18 +12,20 @@ class Servers(Table):
         username = username or nickname
         realname = realname or nickname
         self.database.execute(
-            """INSERT INTO servers (alias, hostname, port, password, ipv4,
-            tls, bindhost, nickname, username, realname) VALUES (
+            """INSERT INTO servers (alias, hostname, port, password, tls,
+            ipv4, bindhost, nickname, username, realname) VALUES (
             ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
-            [alias, hostname, port, password, ipv4, tls, bindhost, nickname,
+            [alias, hostname, port, password, tls, ipv4, bindhost, nickname,
             username, realname])
     def get_all(self):
         return self.database.execute_fetchall(
             "SELECT server_id, alias FROM servers")
-    def get(self, id: int):
+    def get(self, id: int) -> typing.Tuple[int, typing.Optional[str], str,
+            int, typing.Optional[str], bool, bool, typing.Optional[str], str,
+            typing.Optional[str], typing.Optional[str]]:
         return self.database.execute_fetchone(
-            """SELECT server_id, alias, hostname, port, password, ipv4,
-            tls, bindhost, nickname, username, realname FROM servers WHERE
+            """SELECT server_id, alias, hostname, port, password, tls,
+            ipv4, bindhost, nickname, username, realname FROM servers WHERE
             server_id=?""",
             [id])
 
-- 
cgit v1.3.1-10-gc9f91