This commit is contained in:
deathbybandaid 2019-05-29 13:53:56 -04:00
parent 44298e1e1a
commit b2622736fe

View File

@ -12,7 +12,7 @@ from sopel.db import SopelDB, Nicknames, _deserialize
import threading
from .Config import config as botconfig
from sqlalchemy import Column, ForeignKey, Integer, String, PrimaryKeyConstraint
from sqlalchemy import Column, ForeignKey, Integer, String
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.exc import SQLAlchemyError
@ -27,12 +27,9 @@ class PluginValues(BASE):
PluginValues SQLAlchemy Class
"""
__tablename__ = 'plugin_values'
__table_args__ = (
PrimaryKeyConstraint('plugin', 'sortingkey', 'key'),
)
plugin = Column(String(255))
sortingkey = Column(String(255))
key = Column(String(255))
plugin = Column(String(255), primary_key=True)
sortingkey = Column(String(255), index=True)
key = Column(String(255), primary_key=True)
value = Column(String(255))
@ -41,12 +38,9 @@ class NickValues(BASE):
NickValues SQLAlchemy Class
"""
__tablename__ = 'nick_values'
__table_args__ = (
PrimaryKeyConstraint('nick_id', 'sortingkey', 'key'),
)
nick_id = Column(Integer, ForeignKey('nick_ids.nick_id'))
sortingkey = Column(String(255))
key = Column(String(255))
nick_id = Column(Integer, ForeignKey('nick_ids.nick_id'), primary_key=True)
sortingkey = Column(String(255), index=True)
key = Column(String(255), primary_key=True)
value = Column(String(255))
@ -55,12 +49,9 @@ class ChannelValues(BASE):
ChannelValues SQLAlchemy Class
"""
__tablename__ = 'channel_values'
__table_args__ = (
PrimaryKeyConstraint('channel', 'sortingkey', 'key'),
)
channel = Column(String(255))
sortingkey = Column(String(255))
key = Column(String(255))
channel = Column(String(255), primary_key=True)
sortingkey = Column(String(255), index=True)
key = Column(String(255), primary_key=True)
value = Column(String(255))