Changeset 96

Show
Ignore:
Timestamp:
03/27/08 15:51:31 (8 months ago)
Author:
brad
Message:

pragma, need you to look at this one... Tried to clean up console.py for Tablenames

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tracforums/console.py

    r5 r96  
    33import time 
    44from tracforums.core import ForumsCore 
     5from tracforums.db import Tablenames 
    56 
    67class ForumsConsole(Component): 
    …… 
    4849 
    4950    def _do_forum_list(self): 
    50         rows = self.tracadm.db_query("SELECT name, subject, moderators FROM forum ORDER BY name") 
     51        rows = self.tracadm.db_query("SELECT name, subject, moderators FROM %(forum)s ORDER BY name" % Tablenames) 
    5152        self.tracadm.print_listing(['Name', 'Title', 'Moderators'], rows) 
    5253 
    …… 
    5455        moderators = ' '.join(moderators) 
    5556        self.tracadm.db_update(''' 
    56             INSERT INTO forum 
     57            INSERT INTO %(forum)s 
    5758                (name, time, moderators, subject, description) 
    5859            VALUES 
    59                 ('%s', %i, '%s', '%s', '%s')''' % (name, int(time.time()), moderators, subject, description)) 
     60                ('%s', %i, '%s', '%s', '%s')''' % (Tablenames, name, int(time.time()), moderators, subject, description)) 
    6061        print 'Added forum "%s"' % name 
    6162 
    6263    def _do_forum_remove(self, name): 
    63         row = self.tracadm.db_query("SELECT id FROM forum WHERE name='%s'" % name) 
     64        row = self.tracadm.db_query("SELECT id FROM %(forum)s WHERE name='%s'" % (Tablenames, name)) 
    6465        if not row: 
    6566            raise Exception('No such forum "%s"' % name) 
    6667        id = row.next()[0] 
    67         self.tracadm.db_query('DELETE FROM message WHERE forum=%s' % id) 
    68         self.tracadm.db_query('DELETE FROM topic WHERE forum=%s' % id) 
    69         self.tracadm.db_update('DELETE FROM forum WHERE id=%s' % id) 
     68        self.tracadm.db_query('DELETE FROM $(message)s WHERE forum=%s' % (Tablenames, id)) 
     69        self.tracadm.db_query('DELETE FROM %(topic)s WHERE forum=%s' % (Tablenames, id)) 
     70        self.tracadm.db_update('DELETE FROM %(forum)s WHERE id=%s' % (Tablenames, id)) 
    7071        print 'Removed forum "%s"' % name 
    7172 
    …… 
    9596 
    9697    def _do_topic_list(self, forum = None): 
    97         rows = self.tracadm.db_query("SELECT (SELECT name FROM forum WHERE forum.id = topic.forum) subject, author FROM topic ORDER BY time") 
     98        rows = self.tracadm.db_query("SELECT (SELECT name FROM %(forum)s WHERE %(forum)s.id = %(topic)s.forum) subject, author FROM %(topic)s ORDER BY time" % Tablenames) 
    9899        self.tracadm.print_listing(['Name', 'Subject', 'Author'], rows) 
    99100