aboutsummaryrefslogtreecommitdiff
path: root/src/Database.py
diff options
context:
space:
mode:
authorGravatar jesopo2019-05-21 10:11:09 +0100
committerGravatar jesopo2019-05-21 10:11:09 +0100
commitab1074cf4d91224b35fbbc217be4d39d5d5029a0 (patch)
tree68be8748aa3642862dbdfa3fdbb1d73fc677a1ec /src/Database.py
parentevent.eat() in command.regex for !title (diff)
signature
Remove mention of `ipv4` - detect address family automatically
Diffstat (limited to 'src/Database.py')
-rw-r--r--src/Database.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Database.py b/src/Database.py
index 67fe4a6f..6c276754 100644
--- a/src/Database.py
+++ b/src/Database.py
@@ -9,16 +9,16 @@ class Table(object):
class Servers(Table):
def add(self, alias: str, hostname: str, port: int, password: str,
- ipv4: bool, tls: bool, bindhost: str,
- nickname: str, username: str=None, realname: str=None):
+ tls: bool, bindhost: str, nickname: str, username: str=None,
+ realname: str=None):
username = username or nickname
realname = realname or nickname
self.database.execute(
"""INSERT INTO servers (alias, hostname, port, password, tls,
- ipv4, bindhost, nickname, username, realname) VALUES (
+ bindhost, nickname, username, realname) VALUES (
?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
- [alias, hostname, port, password, tls, ipv4, bindhost, nickname,
- username, realname])
+ [alias, hostname, port, password, tls, bindhost, nickname, username,
+ realname])
return self.database.execute_fetchone(
"SELECT server_id FROM servers ORDER BY server_id DESC LIMIT 1")[0]
def get_all(self):
@@ -29,7 +29,7 @@ class Servers(Table):
typing.Optional[str], typing.Optional[str]]:
return self.database.execute_fetchone(
"""SELECT server_id, alias, hostname, port, password, tls,
- ipv4, bindhost, nickname, username, realname FROM servers WHERE
+ bindhost, nickname, username, realname FROM servers WHERE
server_id=?""",
[id])
def get_by_alias(self, alias: str) -> typing.Optional[int]:
@@ -352,7 +352,7 @@ class Database(object):
if not self.has_table("servers"):
self.execute("""CREATE TABLE servers
(server_id INTEGER PRIMARY KEY, alias TEXT, hostname TEXT,
- port INTEGER, password TEXT, ipv4 BOOLEAN, tls BOOLEAN,
+ port INTEGER, password TEXT, tls BOOLEAN,
bindhost TEXT, nickname TEXT, username TEXT, realname TEXT,
UNIQUE (alias))""")
def make_channels_table(self):