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