From b402287cb1f76093c4c72ddcc9af32d8bab8a267 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 30 May 2019 08:21:24 -0400 Subject: [PATCH] test --- sopel_modules/SpiceBot/Database.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 76f8439..3841d13 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -27,9 +27,9 @@ class PluginValues(BASE): """ __tablename__ = 'plugin_values' plugin = Column(String(255), primary_key=True) - category = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) value = Column(String(255)) + category = Column(String(255)) class SpiceDB(object): @@ -225,7 +225,7 @@ class SpiceDB(object): try: result = session.query(PluginValues) \ .filter(PluginValues.plugin == plugin)\ - .filter(PluginValues.category == category)\ + .filter_by(category=category) \ .filter(PluginValues.key == key) \ .one_or_none() # PluginValues exists, update @@ -250,7 +250,7 @@ class SpiceDB(object): try: result = session.query(PluginValues) \ .filter(PluginValues.plugin == plugin)\ - .filter(PluginValues.category == category)\ + .filter_by(category=category) \ .filter(PluginValues.key == key) \ .one_or_none() if result is not None: @@ -269,7 +269,7 @@ class SpiceDB(object): try: result = session.query(PluginValues) \ .filter(PluginValues.plugin == plugin)\ - .filter(PluginValues.category == category)\ + .filter_by(category=category) \ .filter(PluginValues.key == key) \ .one_or_none() # PluginValues exists, delete @@ -290,7 +290,7 @@ class SpiceDB(object): try: result = session.query(PluginValues) \ .filter(PluginValues.plugin == plugin)\ - .filter(PluginValues.category == category)\ + .filter_by(category=category) \ .filter(PluginValues.key == key) \ .one_or_none() # ChannelValue exists, update @@ -318,7 +318,7 @@ class SpiceDB(object): try: result = session.query(PluginValues) \ .filter(PluginValues.plugin == plugin)\ - .filter(PluginValues.category == category)\ + .filter_by(category=category) \ .filter(PluginValues.key == key) \ .one_or_none() # ChannelValue exists, update