diff --git a/exts/admin.py b/exts/admin.py index d790d3f..faac84b 100644 --- a/exts/admin.py +++ b/exts/admin.py @@ -72,7 +72,7 @@ class Admin: emoji_code = f'' else: 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", emoji.name, emoji.id, emoji_code) else: diff --git a/exts/utils.py b/exts/utils.py index 4251a03..96878a1 100644 --- a/exts/utils.py +++ b/exts/utils.py @@ -294,7 +294,7 @@ class Utils: ) if checks.is_admin(self.bot, ctx) or checks.is_rcon_admin(self.bot, ctx): 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) em.title = f'Admin help requests for {ctx.guild.name}' if requests: @@ -314,7 +314,7 @@ class Utils: else: if checks.check_admin_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', assigned_to.id, ctx.guild.id) em.title = f'Admin help requests assigned to {assigned_to.display_name} in {ctx.guild.name}' @@ -334,7 +334,7 @@ class Utils: else: em.title = f'{assigned_to.display_name} is not an admin in this guild.' 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', ctx.author.id, ctx.guild.id) em.title = f'Admin help requests for {ctx.author.display_name}' diff --git a/shared_libs/database.py b/shared_libs/database.py index bb872ec..edcc655 100644 --- a/shared_libs/database.py +++ b/shared_libs/database.py @@ -11,8 +11,8 @@ class DatabaseConnection: asyncio.get_event_loop().run_until_complete(self.acquire()) self.fetchval = self._conn.fetchval self.execute = self._conn.execute - self.fetchall = self._conn.fetchall - self.fetchone = self._conn.fetchone + self.fetch = self._conn.fetch + self.fetchrow = self._conn.fetchrow async def acquire(self): if not self._conn: