Ticket #790: discussion-plugin-0.5-sqlite-2.8.16.patch

File discussion-plugin-0.5-sqlite-2.8.16.patch, 3.8 kB (added by sto, 2 years ago)

Revised patch, timeline.py was missing

  • api.py

    old new  
    779779            order_by = 'g.' + order_by 
    780780        columns = ('id', 'name', 'description', 'forums') 
    781781        sql = "SELECT g.id, g.name, g.description, (SELECT COUNT(f.id) AS" \ 
    782           " forums FROM forum f WHERE f.forum_group = g.id) FROM forum_group" \ 
    783           " g ORDER BY " + order_by + (" ASC", " DESC")[bool(desc)] 
     782          " forums FROM forum f, forum_group g WHERE f.forum_group = g.id)" \ 
     783          " FROM forum_group g ORDER BY " + order_by + (" ASC", " DESC")[bool(desc)] 
    784784        self.log.debug(sql) 
    785785        cursor.execute(sql) 
    786786        for row in cursor: 
    …… 
    798798          'lasttopic') 
    799799        sql = "SELECT f.id, f.name, f.author, f.time, f.moderators," \ 
    800800          " f.forum_group, f.subject, f.description, (SELECT COUNT(t.id)" \ 
    801           " FROM topic t WHERE t.forum = f.id) AS topics, (SELECT COUNT(m.id)" \ 
    802           " FROM message m WHERE m.forum = f.id) AS replies, (SELECT" \ 
    803           " MAX(time) FROM message m WHERE m.forum = f.id) AS lasttopic," \ 
    804           " (SELECT MAX(time) FROM topic t WHERE t.forum = f.id) AS lastreply" \ 
     801          " FROM topic t, forum f WHERE t.forum = f.id) AS topics, (SELECT COUNT(m.id)" \ 
     802          " FROM message m, forum f WHERE m.forum = f.id) AS replies, (SELECT" \ 
     803          " MAX(m.time) FROM message m, forum f WHERE m.forum = f.id) AS lasttopic," \ 
     804          " (SELECT MAX(t.time) FROM topic t, forum f WHERE t.forum = f.id) AS lastreply" \ 
    805805          " FROM forum f ORDER BY " + order_by + (" ASC", " DESC")[bool(desc)] 
    806806        self.log.debug(sql) 
    807807        cursor.execute(sql) 
    …… 
    828828        columns = ('id', 'forum', 'time', 'subject', 'body', 'author', 
    829829          'replies', 'lastreply') 
    830830        sql = "SELECT t.id, t.forum, t.time, t.subject, t.body, t.author," \ 
    831           " (SELECT COUNT(m.id) FROM message m WHERE m.topic = t.id) AS" \ 
    832           " replies, (SELECT MAX(m.time) FROM message m WHERE m.topic = t.id)" \ 
     831          " (SELECT COUNT(m.id) FROM message m, topic t WHERE m.topic = t.id) AS" \ 
     832          " replies, (SELECT MAX(m.time) FROM message m, topic t WHERE m.topic = t.id)" \ 
    833833          " AS lastreply FROM topic t WHERE t.forum = %s ORDER BY " + order_by \ 
    834834          + (" ASC", " DESC")[bool(desc)] 
    835835        self.log.debug(sql % (forum,))