From 64e5dbcfd3ab6afe62b6b235156d46f9d9784c75 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 30 May 2019 08:50:39 -0400 Subject: [PATCH] more filtering test --- sopel_modules/SpiceBot/Database.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 3841d13..9e12290 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) - key = Column(String(255), primary_key=True) + category = Column(String(255), primary_key=True) + key = Column(String(255)) 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_by(category=category) \ + .filter(PluginValues.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_by(category=category) \ + .filter(PluginValues.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_by(category=category) \ + .filter(PluginValues.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_by(category=category) \ + .filter(PluginValues.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_by(category=category) \ + .filter(PluginValues.category == category)\ .filter(PluginValues.key == key) \ .one_or_none() # ChannelValue exists, update