wayfinderak/Geeksbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to Asyncpg for db con

Browse Source
This commit is contained in:
Dustin Pianalto 2018-05-21 19:28:01 -08:00
parent 5e5f50bcc0
commit 7949707a3c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exts/admin.py
View File

@ -72,7 +72,7 @@ class Admin:
emoji_code = f'<a:{emoji.name}:{emoji.id}>' emoji_code = f'<a:{emoji.name}:{emoji.id}>'
else: else:
emoji_code = f'<:{emoji.name}:{emoji.id}>' emoji_code = f'<:{emoji.name}:{emoji.id}>'
if self.bot.db_con.fetchall('select id from geeksbot_emojis where id = $1', emoji.id): if self.bot.db_con.fetch('select id from geeksbot_emojis where id = $1', emoji.id):
self.bot.db_con.execute("update geeksbot_emojis set id = $2, name = $1, code = $3 where name = $1", self.bot.db_con.execute("update geeksbot_emojis set id = $2, name = $1, code = $3 where name = $1",
emoji.name, emoji.id, emoji_code) emoji.name, emoji.id, emoji_code)
else: else:

6
exts/utils.py
View File

@ -294,7 +294,7 @@ class Utils:
) )
if checks.is_admin(self.bot, ctx) or checks.is_rcon_admin(self.bot, ctx): if checks.is_admin(self.bot, ctx) or checks.is_rcon_admin(self.bot, ctx):
if assigned_to is None: if assigned_to is None:
requests = self.bot.db_con.fetchall(f'select * from admin_requests where guild_orig = $1 ' requests = self.bot.db_con.fetch(f'select * from admin_requests where guild_orig = $1 '
f'and completed_time is null', ctx.guild.id) f'and completed_time is null', ctx.guild.id)
em.title = f'Admin help requests for {ctx.guild.name}' em.title = f'Admin help requests for {ctx.guild.name}'
if requests: if requests:
@ -314,7 +314,7 @@ class Utils:
else: else:
if checks.check_admin_role(self.bot, ctx, assigned_to)\ if checks.check_admin_role(self.bot, ctx, assigned_to)\
or checks.check_rcon_role(self.bot, ctx, assigned_to): or checks.check_rcon_role(self.bot, ctx, assigned_to):
requests = self.bot.db_con.fetchall('select * from admin_requests where assigned_to = $1 ' requests = self.bot.db_con.fetch('select * from admin_requests where assigned_to = $1 '
'and guild_orig = $2 and completed_time is null', 'and guild_orig = $2 and completed_time is null',
assigned_to.id, ctx.guild.id) assigned_to.id, ctx.guild.id)
em.title = f'Admin help requests assigned to {assigned_to.display_name} in {ctx.guild.name}' em.title = f'Admin help requests assigned to {assigned_to.display_name} in {ctx.guild.name}'
@ -334,7 +334,7 @@ class Utils:
else: else:
em.title = f'{assigned_to.display_name} is not an admin in this guild.' em.title = f'{assigned_to.display_name} is not an admin in this guild.'
else: else:
requests = self.bot.db_con.fetchall('select * from admin_requests where issuing_member_id = $1 ' requests = self.bot.db_con.fetch('select * from admin_requests where issuing_member_id = $1 '
'and guild_orig = $2 and completed_time is null', 'and guild_orig = $2 and completed_time is null',
ctx.author.id, ctx.guild.id) ctx.author.id, ctx.guild.id)
em.title = f'Admin help requests for {ctx.author.display_name}' em.title = f'Admin help requests for {ctx.author.display_name}'

4
shared_libs/database.py
View File

@ -11,8 +11,8 @@ class DatabaseConnection:
asyncio.get_event_loop().run_until_complete(self.acquire()) asyncio.get_event_loop().run_until_complete(self.acquire())
self.fetchval = self._conn.fetchval self.fetchval = self._conn.fetchval
self.execute = self._conn.execute self.execute = self._conn.execute
self.fetchall = self._conn.fetchall self.fetch = self._conn.fetch
self.fetchone = self._conn.fetchone self.fetchrow = self._conn.fetchrow
async def acquire(self): async def acquire(self):
if not self._conn: if not self._conn: