diff --git a/r2/r2/lib/db/query_queue.py b/r2/r2/lib/db/query_queue.py index 4993f4628..c41a171e5 100644 --- a/r2/r2/lib/db/query_queue.py +++ b/r2/r2/lib/db/query_queue.py @@ -41,7 +41,7 @@ def add_query(cached_results): query_queue_table.insert().execute(d) except SQLError, e: #don't worry about inserting duplicates - if not 'IntegrityError' in e.message: + if not 'IntegrityError' in str(e): raise def remove_query(iden): diff --git a/r2/r2/models/report.py b/r2/r2/models/report.py index 9f63dbc7a..4fc0e1311 100644 --- a/r2/r2/models/report.py +++ b/r2/r2/models/report.py @@ -168,7 +168,7 @@ class Report(MultiRelation('report', rel_table, rel_dtable = tables[0], tables[3] where = [dtable.c.key == 'author_id', - sa.func.substring(dtable.c.value, 1, 1000) == author_id, + sa.func.substring(dtable.c.value, 1, 1000) == str(author_id), dtable.c.thing_id == rel_table.c.thing2_id] if amount is not None: where.extend([rel_table.c.name == str(amount), @@ -431,7 +431,7 @@ def unreport_account(user, correct = True, types = (Link, Comment, Message), by_user_query = sa.and_(table.c.thing_id == dtable.c.thing_id, dtable.c.key == 'author_id', - sa.func.substring(dtable.c.value, 1, 1000) == user._id) + sa.func.substring(dtable.c.value, 1, 1000) == str(user._id)) s = sa.select(["count(*)"], sa.and_(by_user_query, table.c.spam == (not correct))) @@ -453,7 +453,7 @@ def unreport_account(user, correct = True, types = (Link, Comment, Message), u = """UPDATE %(table)s SET spam='%(spam)s' FROM %(dtable)s WHERE %(table)s.thing_id = %(dtable)s.thing_id AND %(dtable)s.key = 'author_id' - AND substring(%(dtable)s.value, 1, 1000) = %(author_id)s""" + AND substring(%(dtable)s.value, 1, 1000) = '%(author_id)s'""" u = u % dict(spam = 't' if correct else 'f', table = table.name, dtable = dtable.name,