Skip to content

Commit a271eaf

Browse files
committed
Changed Database Collation
1 parent ea277c2 commit a271eaf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Teapot.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@
6464
time_start = time.perf_counter()
6565
database = teapot.managers.database.__init__()
6666
db = teapot.managers.database.db(database)
67-
db.execute('ALTER DATABASE teapot CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
67+
db.execute('ALTER DATABASE teapot CHARACTER SET utf8 COLLATE utf8_general_ci')
6868
db.execute(
69-
'CREATE TABLE IF NOT EXISTS `guilds` (`guild_id` BIGINT, `guild_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
69+
'CREATE TABLE IF NOT EXISTS `guilds` (`guild_id` BIGINT, `guild_name` TINYTEXT CHARACTER SET utf8 COLLATE utf8_general_ci) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci')
7070
db.execute(
71-
'CREATE TABLE IF NOT EXISTS `channels` (`channel_id` BIGINT, `channel_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
71+
'CREATE TABLE IF NOT EXISTS `channels` (`channel_id` BIGINT, `channel_name` TINYTEXT CHARACTER SET utf8 COLLATE utf8_general_ci) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci')
7272
db.execute(
73-
"CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci, `user_discriminator` INT) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
73+
"CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT CHARACTER SET utf8 COLLATE utf8_general_ci, `user_discriminator` INT) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
7474
db.execute(
75-
"CREATE TABLE IF NOT EXISTS `bot_logs` (`timestamp` TEXT, `type` TINYTEXT, `class` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
75+
"CREATE TABLE IF NOT EXISTS `bot_logs` (`timestamp` TEXT, `type` TINYTEXT, `class` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
7676
teapot.managers.database.create_table(
77-
"CREATE TABLE IF NOT EXISTS `guild_logs` (`timestamp` TEXT, `guild_id` BIGINT, `channel_id` BIGINT, `message_id` BIGINT, `user_id` BIGINT, `action_type` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci")
77+
"CREATE TABLE IF NOT EXISTS `guild_logs` (`timestamp` TEXT, `guild_id` BIGINT, `channel_id` BIGINT, `message_id` BIGINT, `user_id` BIGINT, `action_type` TINYTEXT, `message` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci")
7878

7979
print(
8080
f"Connected to database ({teapot.config.db_host()}:{teapot.config.db_port()}) in {round(time.perf_counter() - time_start, 2)}s")

teapot/managers/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__():
3030
db=teapot.config.db_schema(),
3131
user=teapot.config.db_user(),
3232
passwd=teapot.config.db_password(),
33-
charset='utf8mb4',
33+
charset='utf8',
3434
use_unicode=True
3535
)
3636
return (database)

0 commit comments

Comments
 (0)