github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 15:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix some pg8.3/python2.6 issues

Browse Source
This commit is contained in:
spez
2009-05-16 07:46:20 -07:00
parent 498c3b01fc
commit ddcd8a3568
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
r2/r2/lib/db/query_queue.py
View File

@@ -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):

6
r2/r2/models/report.py
View File

@@ -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,