From 4cad278049f6ec88891eebd22c41c8d56c5e2a1e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 16:12:30 -0400 Subject: [PATCH] update --- sopel_modules/SpiceBot/Database.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 8d667f6..a3d4a24 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -20,6 +20,9 @@ import threading BASE = declarative_base() +MYSQL_TABLE_ARGS = {'mysql_engine': 'InnoDB', + 'mysql_charset': 'utf8mb4', + 'mysql_collate': 'utf8mb4_unicode_ci'} class NickIDs(BASE): @@ -35,7 +38,7 @@ class Nicknames(BASE): Nicknames SQLAlchemy Class """ __tablename__ = 'spice_nicknames' - __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} + __table_args__ = MYSQL_TABLE_ARGS nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) slug = Column(String(255), primary_key=True) canonical = Column(String(255)) @@ -46,7 +49,7 @@ class NickValues(BASE): NickValues SQLAlchemy Class """ __tablename__ = 'spice_nick_values' - __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} + __table_args__ = MYSQL_TABLE_ARGS nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) @@ -58,7 +61,7 @@ class ChannelValues(BASE): ChannelValues SQLAlchemy Class """ __tablename__ = 'spice_channel_values' - __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} + __table_args__ = MYSQL_TABLE_ARGS channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) @@ -70,7 +73,7 @@ class PluginValues(BASE): PluginValues SQLAlchemy Class """ __tablename__ = 'spice_plugin_values' - __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} + __table_args__ = MYSQL_TABLE_ARGS plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True)