deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-10 21:50:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
deathbybandaid 2019-06-05 18:03:22 -04:00
parent 7d425d529d
commit 6dd0d08da2
1 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sopel_modules/SpiceBot/Database.py
View File

@ -49,7 +49,7 @@ class NickValues(BASE):
nick_id = Column(Integer, ForeignKey('nick_ids.nick_id'), primary_key=True)
namespace = Column(String(255), primary_key=True)
key = Column(String(255), primary_key=True)
value = Column(Text())
value = Column(Text(), convert_unicode=True)
class ChannelValues(BASE):
@ -60,7 +60,7 @@ class ChannelValues(BASE):
channel = Column(String(255), primary_key=True)
namespace = Column(String(255), primary_key=True)
key = Column(String(255), primary_key=True)
value = Column(Text())
value = Column(Text(), convert_unicode=True)
class PluginValues(BASE):
@ -71,7 +71,7 @@ class PluginValues(BASE):
plugin = Column(String(255), primary_key=True)
namespace = Column(String(255), primary_key=True)
key = Column(String(255), primary_key=True)
value = Column(Text())
value = Column(Text(), convert_unicode=True)
class SpiceDB(object):
@ -498,55 +498,6 @@ class BotDatabase():
def __init__(self):
# patch unicode issues
# MySQL - mysql://username:password@localhost/db
# SQLite - sqlite:////home/sopel/.sopel/default.db
db_type = botconfig.config.core.db_type
# Handle SQLite explicitly as a default
if db_type == 'sqlite':
path = botconfig.config.core.db_filename
config_dir, config_file = os.path.split(botconfig.config.filename)
config_name, _ = os.path.splitext(config_file)
if path is None:
path = os.path.join(config_dir, config_name + '.db')
path = os.path.expanduser(path)
if not os.path.isabs(path):
path = os.path.normpath(os.path.join(config_dir, path))
SopelDB.filename = path
SopelDB.url = 'sqlite:///%s' % path
# Otherwise, handle all other database engines
else:
if db_type == 'mysql':
drivername = botconfig.config.core.db_driver or 'mysql'
elif db_type == 'postgres':
drivername = botconfig.config.core.db_driver or 'postgresql'
elif db_type == 'oracle':
drivername = botconfig.config.core.db_driver or 'oracle'
elif db_type == 'mssql':
drivername = botconfig.config.core.db_driver or 'mssql+pymssql'
elif db_type == 'firebird':
drivername = botconfig.config.core.db_driver or 'firebird+fdb'
elif db_type == 'sybase':
drivername = botconfig.config.core.db_driver or 'sybase+pysybase'
else:
raise Exception('Unknown db_type')
db_user = botconfig.config.core.db_user
db_pass = botconfig.config.core.db_pass
db_host = botconfig.config.core.db_host
db_port = botconfig.config.core.db_port # Optional
db_name = botconfig.config.core.db_name # Optional, depending on DB
# Ensure we have all our variables defined
if db_user is None or db_pass is None or db_host is None:
raise Exception('Please make sure the following core '
'configuration values are defined: '
'db_user, db_pass, db_host')
SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass,
host=db_host, port=db_port, database=db_name, charset="utf8")
SopelDB.engine = create_engine(SopelDB.url)
sopel.db.NickValues = NickValues
SopelDB.get_nick_value = SpiceDB.get_nick_value
SopelDB.set_nick_value = SpiceDB.set_nick_value