PostgresqlPatch: pgsql_patch_13.diff

trac/env.py

@@ -22 +22 @@
-from __future__ import generators
-
-from trac import db, db_default, Logging, Mimeview, util
+from types import *
-
-import ConfigParser
-import os
@@ -44 +45 @@
-     * Project specific templates and wiki macros.
-     * wiki and ticket attachments.
-    """
-
+, db_str='sqlite:db/trac.db'
-        self.path = path
-        if create:
-
+db_str
-        self.verify()
-        self.load_config()
-        try: # Use binary I/O on Windows
@@ -81 +82 @@
-        repos = SubversionRepository(repos_dir, authz, self.log)
-        return CachedRepository(self.get_db_cnx(), repos, authz, self.log)
-
-
+, db_str
-        def _create_file(fname, data=None):
-            fd = open(fname, 'w')
-            if data: fd.write(data)
@@ -120 +121 @@
-# Site CSS - Place custom CSS, including overriding styles here.
-?>
-""")
-
-
-
-
-
-
-
+
+
+
+
+
-
+        # Create default database by attempting to get connection
+        cnx = db.get_cnx(self, create=1)
+        cnx.close
+
-    def insert_default_data(self):
-        def prep_value(v):
-            if v == None:
-                return 'NULL'
-            else:
-
+
+
+
+
-        cnx = self.get_db_cnx()
-        cursor = cnx.cursor()
-        
@@ -144 +150 @@
-                values = ','.join(map(prep_value, row))
-                sql = "INSERT INTO %s (%s) VALUES(%s);" % (table, cols, values)
-                cursor.execute(sql)
+        cnx.commit()
+
+    def setup_default_config(self):
-        for s,n,v in db_default.default_config:
-            if not self.cfg.has_section(s):
-                self.cfg.add_section(s)
-            self.cfg.set(s, n, v)
-        self.save_config()
-        cnx.commit()
-
-    def get_version(self):
-        cnx = self.get_db_cnx()

trac/db_default.py

@@ -37 +37 @@
-## Default data
-##
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE TABLE session (
-         sid             text,
-         username        text,
-         var_name        text,
-         var_value       text,
-         UNIQUE(sid,var_name)
-);
-
-CREATE INDEX node_change_idx    ON node_change(rev);
-CREATE INDEX ticket_change_idx  ON ticket_change(ticket, time);
-CREATE INDEX wiki_idx           ON wiki(name,version);
-CREATE INDEX session_idx        ON session(sid,var_name);
-"""
-
-##
-## Default Reports
@@ -289 +265 @@
-  FROM ticket t,enum p
-  WHERE p.name=t.priority AND p.type='priority'
-  ORDER BY (milestone IS NULL), milestone DESC, (status = 'closed'), 
-modified
+changetime
-"""),
-#----------------------------------------------------------------------------
-('My Tickets',

trac/scripts/admin.py

@@ -28 +28 @@
-import cmd
-import shlex
-import StringIO
+import traceback
-
-from trac import perm, util
-from trac.env import Environment
@@ -95 +96 @@
-            return 0
-        return 1
-        
-
+, db_str
-        try:
-create=1
+1, db_str
-            return self.__env
-        except Exception, e:
-            print 'Failed to create environment.', e
+            print traceback.print_exc()
-            sys.exit(1)
-
-    def db_open(self):
@@ -473 +475 @@
-
-    ## Initenv
-    _help_initenv = [('initenv', 'Create and initialize a new environment interactively'),
-
+ <dbstr>
-                      'Create and initialize a new environment from arguments')]
-
-    def do_initdb(self, line):
@@ -506 +508 @@
-        dt = trac.siteconfig.__default_templates_dir__
-        prompt = 'Templates directory [%s]> ' % dt
-        returnvals.append(raw_input(prompt) or dt)
+        print
+        print ' Please specify the database connection string.'
+        print ' Default is for SQLite database.'
+        print ' Examples of current options:'
+        print "  SQLite     -  sqlite:db/trac.db"
+        print "  PostgreSQL -  pypgsql:host='localhost',port='5432',database='trac',user='trac',password='trac'"
+        print
+        db = 'sqlite:db/trac.db'
+        # db = "pypgsql:host='localhost',port='5432',database='trac',user='trac',password='trac'"
+        prompt = 'Database connection string [%s]> ' % db
+        returnvals.append(raw_input(prompt) or db)
-        return returnvals
-         
-    def do_initenv(self, line):
@@ -521 +534 @@
-            project_name = returnvals[0]
-            repository_dir = returnvals[1]
-            templates_dir = returnvals[2]
-
+
+
-            print 'Wrong number of arguments to initenv %d' % len(arg)
-            return
-        else:
-            project_name = arg[0]
-            repository_dir = arg[1]
-            templates_dir = arg[2]
+            db_str = arg[3]
-
-        if not os.access(os.path.join(templates_dir, 'browser.cs'), os.F_OK) \
-           or not os.access(os.path.join(templates_dir, 'ticket.cs'), os.F_OK):
@@ -535 +550 @@
-            return
-        try:
-            print 'Creating and Initializing Project'
-
+db_str
-            cnx = self.__env.get_db_cnx()
-            print ' Inserting default data'
-            self.__env.insert_default_data()
@@ -560 +575 @@
-
-        except Exception, e:
-            print 'Failed to initialize database.', e
+            print traceback.print_exc()
-            sys.exit(2)
-
-

trac/Search.py

@@ -136 +136 @@
-                                'Search Error')
-
-        cursor = self.db.cursor ()
-
+
+
-        q = []
-        if changeset:
-            q.append("SELECT 1 as type, message AS title, message, author, "
-rev
+%s
-                     "FROM revision WHERE %s OR %s" %
-
+
+
-                      self.query_to_sql(query, 'author')))
-        if tickets:
-            q.append("SELECT DISTINCT 2 as type, a.summary AS title, "
-                     "a.description AS message, a.reporter AS author, "
-a.id
+%s
-                     "FROM ticket a LEFT JOIN ticket_change b ON a.id = b.ticket "
-                     "WHERE (b.field='comment' AND %s ) OR "
-                     "%s OR %s OR %s OR %s OR %s" %
-
+
+
-                      self.query_to_sql(query, 'summary'),
-                      self.query_to_sql(query, 'keywords'),
-                      self.query_to_sql(query, 'description'),

trac/Timeline.py

@@ -20 +20 @@
-# Author: Jonas Borgström <jonas@edgewall.com>
-
-from trac import perm
-
+, TracError
-from trac.Module import Module
-from trac.versioncontrol.svn_authz import SubversionAuthorizer
-from trac.web.main import add_link
@@ -43 +43 @@
-        if not filters:
-            return []
-
-
+
+
+
+
+
+
+
-        if 'changeset' in filters:
-rev
-)
-params += (start, stop
+%s
+
+           % (union_fields['changeset'], start, stop) 
-        if 'ticket' in filters:
-id
-)
-params += (start, stop
-ticket
+%s
+
+           % (union_fields['ticket'], start, stop) 
+%s
-                       "FROM ticket_change WHERE field='status' "
-)
-params += (start, stop
-t1.ticket
+
+           % (union_fields['ticket_change_1'], start, stop) 
+%s
-                       "t3.newvalue,t1.author"
-                       " FROM ticket_change t1"
-                       "   INNER JOIN ticket_change t2 ON t1.ticket = t2.ticket"
@@ -65 +71 @@
-                       "     AND t1.ticket = t3.ticket AND t3.field = 'comment'"
-                       " WHERE t1.field = 'status' AND t1.newvalue = 'closed'"
-                       "   AND t2.field = 'resolution'"
-)
-params += (start,stop
+
+           % (union_fields['ticket_change_2'], start, stop) 
-        if 'wiki' in filters:
--1
-)
-params += (start, stop
+''
+ 
+           % (start, stop) 
-        if 'milestone' in filters:
--1
-)
-params += (start, stop
+''
+
+           % (start, stop) 
-
-        sql = ' UNION ALL '.join(sql) + ' ORDER BY time DESC'
-        if maxrows:
-
-
-
+
+
-        cursor = self.db.cursor()
-, params
-
+
+
-        # Make the data more HDF-friendly
-        info = []
-        for idx, row in enum(cursor):
@@ -95 +100 @@
-                'time': time.strftime('%H:%M', t),
-                'date': time.strftime('%x', t),
-                'datetime': time.strftime('%a, %d %b %Y %H:%M:%S GMT', gmt),
-int(row[1])
+row[1]
-                'tdata': escape(row[2]),
-                'type': row[3],
-                'message': row[4] or '',

trac/Report.py

@@ -110 +110 @@
-        cursor = self.db.cursor()
-        cursor.execute("INSERT INTO report (title,sql,description) "
-                       "VALUES (%s,%s,%s)", (title, sql, description))
-
+"report", "id"
-        self.db.commit()
-        req.redirect(self.env.href.report(id))
-

trac/db.py

@@ -21 +21 @@
-
-from __future__ import generators
-
+from trac import db_default
-from trac.util import TracError
-
-import os
-import os.path
+import string
-from threading import Condition, Lock
-
-
@@ -76 +78 @@
-
-    __slots__ = ['cnx']
-
-
+env, create=0, 
-        self.cnx = None
+        if create:
+            self.create_db(env.path, dbpath)
+
-        if dbpath != ':memory:':
-            if not os.access(dbpath, os.F_OK):
-                raise TracError, 'Database "%s" not found.' % dbpath
@@ -93 +98 @@
-        import sqlite
-        cnx = sqlite.connect(dbpath, timeout=timeout)
-        ConnectionWrapper.__init__(self, cnx)
-
-
+
+
+
-        return self.cnx.db.sqlite_last_insert_rowid()
-
+    def create_db(self, path, dbpath):
+        
+        # make the directory to hold the database
+        os.mkdir(os.path.join(path, 'db'))
+        
+        # create the database by getting a connection
+        import sqlite
+        cnx = sqlite.connect(dbpath, timeout=100)
+        
+        # populate the default schema
+        schema = db_default.schema
+        sql = ""
+        
+        for tables in schema:
+            table = tables[0]
+            fields = tables[1]
+            sql_fields = []
+            unique = []
+            sql += "CREATE TABLE %s (\n" % table
+            
+            for field in fields:
+                name = field[0]
+                type = field[1]
+                size = field[2]
+                pk   = field[3]
+                
+                if type == 'auto':
+                    type = 'INTEGER PRIMARY KEY'
+                    
+                if pk == 'u':
+                    unique.append(name)
+                
+                sql_fields.append(" %s %s" % (name, type))
+                
+            if len(unique):
+                sql_fields.append(" UNIQUE(%s)" % ",".join(unique))
+            sql += ",\n".join(sql_fields)
+            sql += "\n);\n\n"
+            
+        cursor = cnx.cursor()
+        cursor.execute(sql)
+        cnx.commit()
+        
+        cursor.close()
+        cnx.close()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    db_str = env.get_config('trac', 'database', 'sqlite:db/trac.db')
-    scheme, rest = db_str.split(':', 1)
-
-    if scheme == 'sqlite':
-        if not rest.startswith('/'):
-            rest = os.path.join(env.path, rest)
-
+, env, create
-
+    if scheme == 'pypgsql':
+        return PyPgSQLConnection(rest, env, create)
+
-    raise TracError, 'Unsupported database type "%s"' % scheme
-
-

trac/Ticket.py

@@ -108 +108 @@
-                       % (','.join(std_fields),
-                          ','.join(['%s'] * len(std_fields))),
-                       map(lambda n, self=self: self[n], std_fields))
-
+"ticket", "id"
-
-        custom_fields = filter(lambda n: n[:7] == 'custom_', self.keys())
-        for name in custom_fields:

contrib/tracdb-sqlite2pg.py

@@ +1 @@
+#!/usr/bin/env python
+
+"""
+Import a Trac database from sqlite to postgresql.
+
+Requires:  Trac from http://trac.edgewall.com/
+           Python 2.3 from http://www.python.org/
+           PostgreSQL from http://www.postgresql.org/
+           PySQLite ?
+           others?
+           
+Author: Brad Anderson <brad@dsource.org>
+
+Note:  Haven't maintained this for a while.  Use very carefully.
+"""
+
+import sys, os
+import sqlite
+import pgdb
+from trac.util import sql_escape
+
+tables=['revision','node_change', 'auth_cookie', 'enum', 'system', 'lock', 
+        'ticket', 'ticket_change', 'ticket_custom', 'report', 'permission',
+        'component', 'milestone', 'version', 'attachment', 'session', 'wiki',
+        'forums', 'topics', 'posts']
+
+# for debugging, one table at a time
+# tables=['wiki']
+
+
+## simple field translation mapping.  if string not in
+## mapping, just return string, otherwise return value
+#class FieldTranslator(dict):
+#    def __getitem__(self, item):
+#        if not dict.has_key(self, item):
+#            return item
+#            
+#        return dict.__getitem__(self, item)
+
+
+
+def convert(_env, _host, _db, _user, _password, _clean):
+    
+    
+    # init PostgreSQL environment
+    print "PostgreSQL('%s':'%s':'%s'): connecting..." \
+                      % (_host, _db, _user)
+    pg_con = pgdb.connect(host=_host, database=_db, 
+                          user=_user, password=_password)
+    pg_cur = pg_con.cursor()
+
+    # init Trac environment
+    print "Trac SQLite('%s'): connecting..." % (_env)
+    trac_con = sqlite.connect(os.path.join(_env, "db/trac.db"),
+                              timeout=10000)
+    trac_cur = trac_con.cursor()
+    print
+
+#    fieldtypes = FieldTranslator()
+#    fieldtypes['0'] = 'int'
+#    fieldtypes['6'] = 'text'
+    
+    # loop thru tables, converting them
+    for t in tables:
+        print
+        print "Converting Table: '%s'" % t
+
+        # clear out existing table
+#        if _clean == 1:
+#            pg_cur.execute("truncate table %s;" % t)
+        pg_cur.execute("truncate table %s;" % t)
+        
+        # get table info
+        sql = "SELECT * FROM %s" % t
+        trac_cur.execute(sql)
+        cols = trac_cur.rs.col_defs
+        counter = 0
+        
+        # loop thru rows, moving data from sqlite to pgsql
+        while 1:
+            row = trac_cur.fetchone()
+            counter += 1
+            if not row:
+                break
+            flds=""
+            vals=""
+            for c in cols:
+                field = c[0]
+                type = c[1]
+                value = row[field]
+                if value != None:
+                    flds += ", %s" % field
+                    if type in [6]:
+                        value = "'%s'" % sql_escape(value)
+                    vals += ", %s" % value
+            flds = flds[2:]
+            vals = vals[2:]
+            sql  = "INSERT INTO %s " % t
+            sql += "(%s) " % flds
+            sql += "VALUES (%s);" % vals
+
+            pg_cur.execute(sql)
+            pg_con.commit()
+            
+            if counter % 100 == 0:
+                print "%s rows" % counter
+        
+    trac_cur.close()
+    trac_con.close()
+    pg_cur.close()
+    pg_con.close()
+    print
+        
+    
+def usage():
+    print "tracdb-sqlite2pg - Converts a Trac database from sqlite to " \
+          "postgresql."
+    print
+    print "This script is designed to transfer an existing Trac SQLite "
+    print "database to an existing Trac PosgreSQL database.  The two " 
+    print "databases should be of the same version.  Check in the 'system' "
+    print "table in each database to verify.  This script runs on version 8 "
+    print "and above.  This is for Trac pre 0.9 (revision 1169 and higher)."
+    print
+    print "Note: you can make a Trac PosgreSQL database with trac-admin "
+    print "(the version that accompanies this script)"
+    print
+    print "THIS WILL DESTROY ALL DATA IN THE POSTGRESQL DATABASE !! "
+    print
+    print
+    print "Usage: tracdb-sqlite2pg.py [options]"
+    print
+    print "Available Options:"
+    print "  -t  | --tracenv /path/to/trac/env - full path to Trac environment"
+    print "  -h  | --host <pgsql hostname>     - PostgreSQL hostname"
+    print "  -db | --database <pgsql database> - PostgreSQL database name"
+    print "  -u  | --user <pgsql username>     - PostgreSQL username"
+    print "  -p  | --passwd <pgsql password>   - PostgreSQL password"
+#    print "  -c  | --clean                     - clean out PG database " \
+#          "before converting. (recommended)"
+    print "  --help | help                     - this help info"
+    print
+    print "Additional configuration options can be defined directly in the " \
+          "script."
+    print
+    sys.exit(0)
+
+def main():
+    global TRAC_ENV, PG_HOST, PG_DB, PG_USER, PG_PASSWORD, PG_CLEAN
+    if len (sys.argv) > 1:
+        if sys.argv[1] in ['--help','help'] or len(sys.argv) < 4:
+            usage()
+        iter = 1
+        while iter < len(sys.argv):
+            if sys.argv[iter] in ['-t', '--tracenv'] and iter+1 < len(sys.argv):
+                TRAC_ENV = sys.argv[iter+1]
+                iter = iter + 1
+            elif sys.argv[iter] in ['-h', '--host'] and iter+1 < len(sys.argv):
+                PG_HOST = sys.argv[iter+1]
+                iter = iter + 1
+            elif sys.argv[iter] in ['-db', '--database'] and \
+                    iter+1 < len(sys.argv):
+                PG_DB = sys.argv[iter+1]
+                iter = iter + 1
+            elif sys.argv[iter] in ['-u', '--user'] and iter+1 < len(sys.argv):
+                PG_USER = sys.argv[iter+1]
+                iter = iter + 1
+            elif sys.argv[iter] in ['-p', '--passwd'] and \
+                    iter+1 < len(sys.argv):
+                PG_PASSWORD = sys.argv[iter+1]
+                iter = iter + 1
+#            elif sys.argv[iter] in ['-c', '--clean']:
+#                PG_CLEAN = 1
+            else:
+                print "Error: unknown parameter: " + sys.argv[iter]
+                sys.exit(0)
+            iter = iter + 1
+    else:
+        usage()
+        
+    convert(TRAC_ENV, PG_HOST, PG_DB, PG_USER, PG_PASSWORD, PG_CLEAN)
+
+
+if __name__ == '__main__':
+    main()