Changeset 2374
- Timestamp:
- 07/03/07 15:27:04 (2 years ago)
- Files:
-
- discussionplugin/0.11/tracdiscussion/api.py (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
discussionplugin/0.11/tracdiscussion/api.py
r2365 r2374 678 678 679 679 def get_message(self, context, id): 680 id = unicode(id)681 680 columns = ('id', 'forum', 'topic', 'replyto', 'time', 'author', 'body') 682 681 sql = "SELECT id, forum, topic, replyto, time, author, body FROM" \ 683 682 " message WHERE id = %s" 684 context.env.log.debug(sql % ( id))685 context.cursor.execute(sql, ( id))683 context.env.log.debug(sql % (unicode(id),)) 684 context.cursor.execute(sql, (unicode(id),)) 686 685 for row in context.cursor: 687 686 row = dict(zip(columns, row)) … … 693 692 sql = "SELECT id, forum, topic, replyto, time, author, body FROM" \ 694 693 " message WHERE time = %s" 695 context.env.log.debug(sql % (time ))696 context.cursor.execute(sql, (time ))694 context.env.log.debug(sql % (time,)) 695 context.cursor.execute(sql, (time,)) 697 696 for row in context.cursor: 698 697 row = dict(zip(columns, row)) … … 701 700 702 701 def get_topic(self, context, id): 703 id = unicode(id)704 702 columns = ('id', 'forum', 'subject', 'time', 'author', 'body') 705 703 sql = "SELECT id, forum, subject, time, author, body FROM topic WHERE" \ 706 704 " id = %s" 707 context.env.log.debug(sql % ( id))708 context.cursor.execute(sql, ( id))705 context.env.log.debug(sql % (unicode(id),)) 706 context.cursor.execute(sql, (unicode(id),)) 709 707 for row in context.cursor: 710 708 row = dict(zip(columns, row)) … … 716 714 sql = "SELECT id, forum, subject, time, author, body FROM topic WHERE" \ 717 715 " time = %s" 718 context.env.log.debug(sql % (time ))719 context.cursor.execute(sql, (time ))716 context.env.log.debug(sql % (time,)) 717 context.cursor.execute(sql, (time,)) 720 718 for row in context.cursor: 721 719 row = dict(zip(columns, row)) … … 727 725 sql = "SELECT id, forum, subject, time, author, body FROM topic WHERE" \ 728 726 " subject = %s" 729 context.env.log.debug(sql % (subject ))730 context.cursor.execute(sql, (subject ))727 context.env.log.debug(sql % (subject,)) 728 context.cursor.execute(sql, (subject,)) 731 729 for row in context.cursor: 732 730 row = dict(zip(columns, row)) … … 735 733 736 734 def get_topic_to_recipients(self, context, id): 737 id = unicode(id)738 735 sql = "SELECT t.author FROM topic t WHERE t.id = %s UNION SELECT" \ 739 736 " m.author FROM message m WHERE m.topic = %s" 740 context.env.log.debug(sql % ( id, id))741 context.cursor.execute(sql, ( id, id))737 context.env.log.debug(sql % (unicode(id), unicode(id))) 738 context.cursor.execute(sql, (unicode(id), unicode(id))) 742 739 to_recipients = [] 743 740 for row in context.cursor: … … 749 746 750 747 def get_forum(self, context, id): 751 id = unicode(id)752 748 columns = ('id', 'group', 'name', 'subject', 'time', 'moderators', 753 749 'description') 754 750 sql = "SELECT id, forum_group, name, subject, time, moderators," \ 755 751 " description FROM forum WHERE id = %s" 756 context.env.log.debug(sql % ( id))757 context.cursor.execute(sql, ( id))752 context.env.log.debug(sql % (unicode(id),)) 753 context.cursor.execute(sql, (unicode(id),)) 758 754 for row in context.cursor: 759 755 row = dict(zip(columns, row)) … … 763 759 764 760 def get_group(self, context, id): 765 id = unicode(id)766 761 columns = ('id', 'name', 'description') 767 762 sql = "SELECT id, name, description FROM forum_group WHERE id = %s" 768 context.env.log.debug(sql % ( id))769 context.cursor.execute(sql, ( id))763 context.env.log.debug(sql % (unicode(id),)) 764 context.cursor.execute(sql, (unicode(id),)) 770 765 for row in context.cursor: 771 766 row = dict(zip(columns, row)) … … 895 890 " topic) m ON t.id = m.topic WHERE t.forum = %s ORDER BY " \ 896 891 + order_by + (" ASC", " DESC")[bool(desc)] 897 context.env.log.debug(sql % ( forum_id))898 context.cursor.execute(sql, ( forum_id))892 context.env.log.debug(sql % (unicode(forum_id),)) 893 context.cursor.execute(sql, (unicode(forum_id),)) 899 894 topics = [] 900 895 for row in context.cursor: … … 915 910 sql = "SELECT m.id, m.replyto, m.time, m.author, m.body FROM message m WHERE" \ 916 911 " m.topic = %s ORDER BY " + order_by + (" ASC", " DESC")[bool(desc)] 917 context.env.log.debug(sql % ( topic_id))918 context.cursor.execute(sql, ( topic_id))912 context.env.log.debug(sql % (unicode(topic_id),)) 913 context.cursor.execute(sql, (unicode(topic_id),)) 919 914 messagemap = {} 920 915 messages = [] … … 947 942 sql = "SELECT m.id, m.replyto, m.time, m.author, m.body FROM message m" \ 948 943 " WHERE m.topic = %s " + order_by 949 context.env.log.debug(sql % ( topic_id))950 context.cursor.execute(sql, ( topic_id))944 context.env.log.debug(sql % (unicode(topic_id),)) 945 context.cursor.execute(sql, (unicode(topic_id),)) 951 946 messages = [] 952 947 for row in context.cursor: … … 999 994 def delete_group(self, context, group): 1000 995 sql = "DELETE FROM forum_group WHERE id = %s" 1001 context.env.log.debug(sql % ( group))1002 context.cursor.execute(sql, ( group))996 context.env.log.debug(sql % (unicode(group),)) 997 context.cursor.execute(sql, (unicode(group),)) 1003 998 sql = "UPDATE forum SET forum_group = 0 WHERE forum_group = %s" 1004 context.env.log.debug(sql % ( group))1005 context.cursor.execute(sql, ( group))999 context.env.log.debug(sql % (unicode(group),)) 1000 context.cursor.execute(sql, (unicode(group),)) 1006 1001 1007 1002 def delete_forum(self, context, forum): 1008 1003 sql = "DELETE FROM message WHERE forum = %s" 1009 context.env.log.debug(sql % ( forum))1010 context.cursor.execute(sql, ( forum))1004 context.env.log.debug(sql % (unicode(forum),)) 1005 context.cursor.execute(sql, (unicode(forum),)) 1011 1006 sql = "DELETE FROM topic WHERE forum = %s" 1012 context.env.log.debug(sql % ( forum))1013 context.cursor.execute(sql, ( forum))1007 context.env.log.debug(sql % (unicode(forum),)) 1008 context.cursor.execute(sql, (unicode(forum),)) 1014 1009 sql = "DELETE FROM forum WHERE id = %s" 1015 context.env.log.debug(sql % ( forum))1016 context.cursor.execute(sql, ( forum))1010 context.env.log.debug(sql % (unicode(forum),)) 1011 context.cursor.execute(sql, (unicode(forum),)) 1017 1012 1018 1013 def delete_topic(self, context, topic): 1019 1014 sql = "DELETE FROM message WHERE topic = %s" 1020 context.env.log.debug(sql % ( topic))1021 context.cursor.execute(sql, ( topic))1015 context.env.log.debug(sql % (unicode(topic),)) 1016 context.cursor.execute(sql, (unicode(topic),)) 1022 1017 sql = "DELETE FROM topic WHERE id = %s" 1023 context.env.log.debug(sql % ( topic))1024 context.cursor.execute(sql, ( topic))1018 context.env.log.debug(sql % (unicode(topic),)) 1019 context.cursor.execute(sql, (unicode(topic),)) 1025 1020 1026 1021 def delete_message(self, context, message): 1027 1022 # Get message replies 1028 1023 sql = "SELECT m.id FROM message m WHERE m.replyto = %s" 1029 context.env.log.debug(sql % ( message))1030 context.cursor.execute(sql, ( message))1024 context.env.log.debug(sql % (unicode(message),)) 1025 context.cursor.execute(sql, (unicode(message),)) 1031 1026 replies = [] 1032 1027 … … 1041 1036 # Delete message itself 1042 1037 sql = "DELETE FROM message WHERE id = %s" 1043 context.env.log.debug(sql % ( message))1044 context.cursor.execute(sql, ( message))1038 context.env.log.debug(sql % (unicode(message),)) 1039 context.cursor.execute(sql, (unicode(message),))
