PostgresqlPatch: pgsql_patch_08.diff

scripts/trac-admin

@@ -27 +27 @@
-import time
-import cmd
-import shlex
-import sqlite
-import StringIO
+import traceback
-
-from trac import util
-from trac import sync
@@ -92 +92 @@
-            return 0
-        return 1
-        
-
+, db_str
-        try:
-create=1
+1, db_str
-            return self.__env
-        except Exception, e:
-            print 'Failed to create environment.', e
@@ -111 +111 @@
-
-    def db_execsql (self, sql, cursor=None):
-        data = []
+        row = None
-        if not cursor:
-            cnx=self.db_open()
-            cursor = cnx.cursor()
@@ -118 +119 @@
-            cnx = None
-        cursor.execute(sql)
-        while 1:
-
+
+
+
+
-            if row == None:
-                break
-            data.append(row)
@@ -457 +461 @@
-
-    ## Initenv
-    _help_initenv = [('initenv', 'Create and initialize a new environment interactively'),
-
+ <dbms> [dbms options]
-                      'Create and initialize a new environment from arguments')]
-
-    def do_initdb(self, line):
@@ -490 +494 @@
-        dt = trac.siteconfig.__default_templates_dir__
-        prompt = 'Templates directory [%s]> ' % dt
-        returnvals.append(raw_input(prompt) or dt)
+        print
+        print " Please enter the database in which you wish to store Trac data."
+        print " Default is 'sqlite', but others are supported:"
+        print " 'sqlite' - SQLite       http://www.sqlite.org"
+        print " 'pgsql'  - PostgreSQL   http://www.postgresql.org"
+        print
+        ddb = "sqlite"
+        prompt =  'database system [%s]> ' % ddb
+        dbms = raw_input(prompt) or ddb
+        returnvals.append(dbms)
+        
+        # PostgreSQL - additional questions
+        if dbms == "pgsql":
+            print
+            print " Please enter the host of your PostgreSQL database."
+            print " Default is 'localhost'"
+            print
+            host = "localhost"
+            prompt = "PostgreSQL host [%s]> " % host
+            returnvals.append(raw_input(prompt) or host)
+            
+            print
+            print " Please enter the port of your PostgreSQL database."
+            print " Default is '5432'"
+            print
+            port = "5432"
+            prompt = "PostgreSQL port [%s]> " % port
+            returnvals.append(raw_input(prompt) or port)
+            
+            print
+            print " Please enter the name of your PostgreSQL database."
+            print " Default is 'trac'"
+            print " Note: This database should not exist, as trac-admin will" \
+                  " attempt to create it."
+            print
+            name = "trac"
+            prompt = "PostgreSQL database [%s]> " % name
+            returnvals.append(raw_input(prompt) or name)
+            
+            print
+            print " Please enter the user of your PostgreSQL database."
+            print " Default is 'trac'"
+            print
+            user = "trac"
+            prompt = "PostgreSQL user [%s]> " % user
+            returnvals.append(raw_input(prompt) or user)
+            
+            print
+            print " Please enter the password of your PostgreSQL database."
+            print " Default is 'trac'"
+            print
+            password = "trac"
+            prompt = "PostgreSQL password [%s]> " % password
+            returnvals.append(raw_input(prompt) or password)
+            
-        return returnvals
-         
-    def do_initenv(self, line):
@@ -500 +559 @@
-        project_name = None
-        repository_dir = None
-        templates_dir = None
+        db_str = None
-        if len(arg) == 1:
-            returnvals = self.get_initenv_args()
-            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]
+        
+        # sqlite-specific stuff
+        if db_str.lower() == "sqlite":
+            db_str = 'sqlite:"db/trac.db",timeout=10000'
+        
+        # postgres-specific stuff
+        if db_str.lower() == "pgsql":
+            if len(arg) == 1:
+                host = returnvals[4]
+                port = returnvals[5]
+                database = returnvals[6]
+                user = returnvals[7]
+                password = returnvals[8]
+            elif len(arg) != 9:
+                print 'Wrong number of arguments to initenv %d' % len(arg)
+                print 'For PostgreSQL (after pgsql): <host> <port> <database>' \
+                      ' <user> <password>'
+                return
+            else:
+                host = arg[4]
+                port = arg[5]
+                database = arg[6]
+                user = arg[7]
+                password = arg[8]
+            db_str = "pgsql:\"\",host='%s:%s',database='%s',user='%s'," \
+                     "password='%s'" \
+                     % (host, port, database, user, password)
+            createdb_str = "createdb --host=%s --port=%s --owner=%s " \
+                           "--username=%s %s\n" \
+                           % (host, port, user, user, database)
+            print createdb_str
+            try:
+                # TODO: this is not cross-platform.
+                # for Windows, look at win32pipe.popen()
+                os.popen(createdb_str)
+            except Exception, e:
+                print "Error creating PostgreSQL database: %s" % e
+                print "command: %s" % createdb_str
+        
-        from svn import util, repos, core
-        core.apr_initialize()
-        pool = core.svn_pool_create(None)
@@ -530 +631 @@
-            return
-        try:
-            print 'Creating and Initializing Project'
-
+db_str
-            cnx = self.__env.get_db_cnx()
-            print ' Inserting default data'
-            self.__env.insert_default_data()
@@ -669 +770 @@
-                self.do_help ('wiki')
-        except Exception, e:
-            print 'Wiki %s failed:' % arg[0], e
+            print traceback.print_exc()
+            
-
-    def _do_wiki_list(self):
-        data = self.db_execsql('SELECT name,max(version),time'
@@ -799 +902 @@
-        self.print_listing(['Possible Values'], data)
-
-    def _do_enum_add(self, type, name):
+
-        sql = ("INSERT INTO enum(value,type,name) "
-               " SELECT 1+COALESCE(max(value),0),'%(type)s','%(name)s'"
-               "   FROM enum WHERE type='%(type)s'" 

trac/db_default.py

@@ -172 +172 @@
-CREATE INDEX session_idx        ON session(sid,var_name);
-"""
-
+schema_pgsql = """
+CREATE TABLE revision (
+        rev             integer,
+        time            integer,
+        author          text,
+        message         text,
+        CONSTRAINT revision_pkey PRIMARY KEY (rev)
+);
+
+CREATE TABLE node_change (
+        rev             integer,
+        name            text,
+        change          char(1),
+        CONSTRAINT node_change_pkey PRIMARY KEY (rev, name, change)
+);
+
+CREATE TABLE auth_cookie (
+        cookie          text,
+        name            text,
+        ipnr            text,
+        time            integer,
+        CONSTRAINT auth_cookie_pkey PRIMARY KEY(cookie, name, ipnr)
+);
+
+CREATE TABLE enum (
+        type            text,
+        name            text,
+        value           integer,
+        CONSTRAINT enum_pkey PRIMARY KEY(name,type)
+);
+
+CREATE TABLE system (
+        name            text,
+        value           text,
+        CONSTRAINT system_pkey PRIMARY KEY(name)
+);
+
+CREATE TABLE lock (
+        name            text,
+        owner           text,
+        ipnr            text,
+        time            integer,
+        CONSTRAINT lock_pkey PRIMARY KEY(name)
+);
+
+--CREATE SEQUENCE ticket_id_seq;
+CREATE TABLE ticket (
+        id              serial,
+        time            integer,        -- the time it was created
+        changetime      integer,
+        component       text,
+        severity        text,
+        priority        text,
+        owner           text,           -- who is this ticket assigned to
+        reporter        text,
+        cc              text,           -- email addresses to notify
+        url             text,           -- url related to this ticket
+        version         text,           -- 
+        milestone       text,           -- 
+        status          text,
+        resolution      text,
+        summary         text,           -- one-line summary
+        description     text,           -- problem description (long)
+        keywords        text,
+        CONSTRAINT ticket_pkey PRIMARY KEY(id)
+);
+
+CREATE TABLE ticket_change (
+        ticket          integer,
+        time            integer,
+        author          text,
+        field           text,
+        oldvalue        text,
+        newvalue        text,
+        CONSTRAINT ticket_change_pkey PRIMARY KEY(ticket, time, field)
+);
+
+CREATE TABLE ticket_custom (
+       ticket           integer,
+       name             text,
+       value            text,
+       CONSTRAINT ticket_custom_pkey PRIMARY KEY(ticket,name)
+);
+
+--CREATE SEQUENCE report_id_seq;
+CREATE TABLE report (
+        id              serial,
+        author          text,
+        title           text,
+        sql             text,
+        description     text,
+        CONSTRAINT report_pkey PRIMARY KEY(id)
+);
+
+CREATE TABLE permission (
+        username        text,           -- 
+        action          text,           -- allowable activity
+        CONSTRAINT permission_pkey PRIMARY KEY(username,action)
+);
+
+CREATE TABLE component (
+         name            text,
+         owner           text,
+         CONSTRAINT component_pkey PRIMARY KEY(name)
+);
+
+CREATE TABLE milestone (
+         name            text,
+         due             integer, -- Due date/time
+         completed       integer, -- Completed date/time
+         description     text,
+         CONSTRAINT milestone_pkey PRIMARY KEY(name)
+);
+
+CREATE TABLE version (
+         name            text,
+         time            integer,
+         CONSTRAINT version_pkey PRIMARY KEY(name)
+);
+
+CREATE TABLE wiki (
+         name            text,
+         version         integer,
+         time            integer,
+         author          text,
+         ipnr            text,
+         text            text,
+         comment         text,
+         readonly        integer,
+         CONSTRAINT wiki_pkey PRIMARY KEY(name,version)
+);
+
+CREATE TABLE attachment (
+         type            text,
+         id              text,
+         filename        text,
+         size            integer,
+         time            integer,
+         description     text,
+         author          text,
+         ipnr            text,
+         CONSTRAINT attachment_pkey PRIMARY KEY(type,id,filename)
+);
+
+CREATE TABLE session (
+         sid             text,
+         username        text,
+         var_name        text,
+         var_value       text,
+         CONSTRAINT session_pkey PRIMARY KEY(sid,var_name)
+);
+
+"""
+
-##
-## Default Reports
-##
@@ -293 +447 @@
-  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',
@@ -411 +565 @@
- (('trac', 'htdocs_location', '/trac/'),
-  ('trac', 'repository_dir', '/var/svn/myrep'),
-  ('trac', 'templates_dir', '/usr/lib/trac/templates'),
-db/trac.db
+"db/trac.db",timeout=10000
-  ('trac', 'default_charset', 'iso-8859-15'),
-  ('logging', 'log_type', 'none'),
-  ('logging', 'log_file', 'trac.log'),

trac/Search.py

@@ -117 +117 @@
-
-        cursor = self.db.cursor ()
-
+        # ugly 'cast' hack for sqlite vs other dbms
+        # and UNION ALL requiring like column datatypes
+        data_changeset = 'rev'
+        data_tickets = 'a.id'
+        dbms = self.env.dbms
+        if dbms != 'sqlite':
+            data_changeset = 'cast(rev as text)'
+            data_tickets = 'cast(a.id as text)'
+
-        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, '
-
-
-
-
-
+
+
+
+
+
+
-                       self.query_to_sql(query, 'summary'),
-                       self.query_to_sql(query, 'keywords'),
-                       self.query_to_sql(query, 'description'),

trac/Query.py

@@ -154 +154 @@
-        sql.append("\nFROM ticket")
-        for k in [k for k in cols if k in custom_fields]:
-           sql.append("\n  LEFT OUTER JOIN ticket_custom AS %s ON " \
-
+ tc
-
-        for col in [c for c in ['status', 'resolution', 'priority', 'severity']
-                    if c == self.order or c == self.group]:
-            sql.append("\n  LEFT OUTER JOIN (SELECT name AS %s_name, " \
-                                            "value AS %s_value " \
-
+ e
-                       " ON %s_name=%s" % (col, col, col, col, col))
-        for col in [c for c in ['milestone', 'version']
-                    if c == self.order or c == self.group]:
-            time_col = col == 'milestone' and 'due' or 'time'
-            sql.append("\n  LEFT OUTER JOIN (SELECT name AS %s_name, " \
-
+ a
-                       " ON %s_name=%s" % (col, time_col, col, col, col, col))
-
-        def get_constraint_sql(name, value, mode, neg):

trac/Report.py

@@ -110 +110 @@
-    def create_report(self, req, title, description, sql):
-        self.perm.assert_permission(perm.REPORT_CREATE)
-
+        dbms = self.env.get_dbms()
-        cursor = self.db.cursor()
-
-
-
+
+
+
+
+
+
+
+
+
+
-        self.db.commit()
-        req.redirect(self.env.href.report(id))
-

trac/tests/tracadmin-tests.txt

@@ -1 +1 @@
-===== test_help_ok =====
-%(version)s
+0.8
-
-Usage: trac-admin </path/to/projenv> [command [subcommand] [option ...]]
-
-Invoking trac-admin without command starts interactive mode.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- Set version date (Format: "%(date_format_hint)s
-
-
-
-
--- Set milestone due date (Format: "%(date_format_hint)s
--- Set milestone completed date (Format: "%(date_format_hint)s
-
+                      
+                      
+                      
+<dbms> [dbms options] 
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      
+                      -- Set version date (Format: "MM/DD/YY
+                      
+                      
+                      
+                      
+                      -- Set milestone due date (Format: "MM/DD/YY
+                      -- Set milestone completed date (Format: "MM/DD/YY
+                      
-
-Visit the Trac Project at http://trac.edgewall.com/
-

trac/tests/ticket.py

@@ -18 +18 @@
-        assert ticket['reporter'] == 'santa'
-        assert ticket['summary'] == 'Foo'
-        assert ticket['custom_foo'] == 'This is a custom field'
-
+, self.dbms
-        # Retrieving ticket
-        ticket2 = Ticket(self.db, 1)
-        assert ticket2['id'] == 1

trac/tests/environment.py

@@ -10 +10 @@
-        self.env = Environment(self._get_envpath(), create=1)
-        self.env.insert_default_data()
-        self.db = self.env.get_db_cnx()
+        self.dbms = self.env.get_dbms()
-
-    def tearDown(self):
-        self.env = None
@@ -36 +37 @@
-
-    def test_config(self):
-        """Testing env.get/set_config"""
-
+
+
-        self.env.set_config('foo', 'bar', 'baz')
-        self.env.save_config()
-        assert self.env.get_config('foo', 'bar') == 'baz'

trac/tests/query.py

@@ -35 +35 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component
-FROM ticket
-
+e 
-ORDER BY COALESCE(priority,'')='',priority_value,id""")
-
-    def test_all_ordered_by_priority_desc(self):
@@ -44 +44 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component
-FROM ticket
-
+e 
-ORDER BY COALESCE(priority,'')='' DESC,priority_value DESC,id""")
-
-    def test_all_ordered_by_version(self):
@@ -53 +53 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,version
-FROM ticket
-
+a 
-ORDER BY COALESCE(version,'')='',COALESCE(version_time,0)=0,version_time,version,id""")
-
-    def test_all_ordered_by_version_desc(self):
@@ -62 +62 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,version
-FROM ticket
-
+a 
-ORDER BY COALESCE(version,'')='' DESC,COALESCE(version_time,0)=0 DESC,version_time DESC,version DESC,id""")
-
-    def test_constrained_by_milestone(self):
@@ -81 +81 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,component,version,milestone
-FROM ticket
-
+a 
-ORDER BY COALESCE(milestone,'')='',COALESCE(milestone_time,0)=0,milestone_time,milestone,COALESCE(id,0)=0,id""")
-
-    def test_all_grouped_by_milestone_desc(self):
@@ -90 +90 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,component,version,milestone
-FROM ticket
-
+a 
-ORDER BY COALESCE(milestone,'')='' DESC,COALESCE(milestone_time,0)=0 DESC,milestone_time DESC,milestone DESC,COALESCE(id,0)=0,id""")
-
-    def test_grouped_by_priority(self):
@@ -99 +99 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,milestone,component,version,priority
-FROM ticket
-
+e 
-ORDER BY COALESCE(priority,'')='',priority_value,id""")
-
-    def test_constrained_by_milestone_not(self):
@@ -170 +170 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component, foo.value AS foo
-FROM ticket
-
+ tc
-WHERE COALESCE(foo,'')='something'
-ORDER BY COALESCE(id,0)=0,id""")
-

trac/tests/db.py

@@ +1 @@
+
+import unittest
+from trac.Environment import Environment # TODO: take out trac. when being run
+                                         #       from normal trac/test.py
+
+class DBTestBase:
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+class DBTestCase(DBTestBase, unittest.TestCase):
+    def test_connect(self):
+        """Testing db.connect"""
+        env = Environment('/var/trac/test')  # TODO: make more generic
+                                             # for now, it's my local pgsql env
+        cnx = env.get_db_cnx()
+        cursor = cnx.cursor()
+        cursor.execute("select * from system")
+        row = cursor.fetchone()
+        print row
+        cnx.close()
+
+    def test_parse_args(self):
+        """Testing db.parse_args"""
+        
+def suite():
+    return unittest.makeSuite(DBTestCase,'test')
+    
+# TODO: take this out when we put this in with the other tests
+# Q: will we be able to do these tests for different dbms's in the test suite?
+if __name__ == '__main__':
+    unittest.main(defaultTest='suite')
+        

trac/Session.py

@@ -64 +64 @@
-    def get_session(self, sid):
-        self.sid = sid
-        curs = self.db.cursor()
-
-self.sid
+ 
+(self.sid,)
-        rows = curs.fetchall()
-        if (not rows                              # No session data yet
-            or rows[0][0] == 'anonymous'          # Anon session

trac/db.py

@@ +1 @@
+# -*- coding: iso8859-1 -*-
+#
+# Copyright (C) 2005 Edgewall Software
+# Copyright (C) 2005 Brad Anderson <brad@dsource.org>
+#
+# Trac is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# Trac is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# Author: Brad Anderson <brad@dsource.org>
+
+import os
+
+class DBConnection:
+    def __init__(self, module_name, connect_params):
+        # set some variables
+        self.module_name = module_name
+        self.connect_params = connect_params
+        
+        # prepare the connection
+        self.parse_args()
+        self.connect()
+    
+    def __getattr__(self, name):
+        """DBConnection is a wrapper for the dbms's connection, and here's 
+           the magic that allows this."""
+        return getattr(self.db, name)
+
+    def parse_args(self):
+        """very crude code for parsing the arguments in connect_params"""
+        kargs = {}
+        arg_list = []
+        for x in self.connect_params:
+            pos1 = x.find('=')
+            pos2 = x.find('"')
+            pos3 = x.find("'")
+            if pos1 > -1:
+                if pos2 > -1 and pos2 < pos1:
+                    arg_list.append(eval(x))
+                elif pos3 > -1 and pos3 < pos1:
+                    arg_list.append(eval(x))
+                else:
+                    name = x[:pos1].strip()
+                    value = eval(x[pos1+1:].strip())
+                    kargs[name] = value
+            else:
+                arg_list.append(eval(x))
+        self.args = tuple(arg_list)
+        self.kargs = kargs
+        
+        
+class SQLiteDBConnection(DBConnection):
+    
+    def connect(self):
+
+        # FIXME: this was pulled from Environment, and so some of the self.* 
+        #        variables need to be cleaned up and this method tested.
+        
+        
+        # since Trac has a slightly closer relationship with sqlite than
+        # other db's, there's a special case setup here so that when the
+        # path to the sqlite db is specified, its relative to TRAC_ENV
+        db_name = os.path.join(self.path, args[0])
+        args = list(args)
+        args[0] = '%s' % db_name
+        args = tuple(args)
+        if check_exists == 1 and not os.access(db_name, os.F_OK):
+            raise EnvironmentError, 'Database "%s" not found.' % db_name
+    
+        directory = os.path.dirname(db_name)
+        if (check_exists == 1 and not os.access(db_name, os.R_OK + os.W_OK)) \
+            or not os.access(directory, os.R_OK + os.W_OK):
+            raise EnvironmentError, \
+                  'The web server user requires read _and_ write permission\n' \
+                  'to the database %s and the directory in which this file ' \
+                  'is located.' % db_name
+
+        # import database module
+        import_str = 'import sqlite'
+        exec import_str
+        m = eval('sqlite')
+        
+        # get connection
+        self.db = m.connect(*self.args, **self.kargs)
+
+   
+class PostgreSQLDBConnection(DBConnection):
+    
+    def connect(self):
+        
+        # get strings for proper pgsql module
+        if self.module_name == 'pgsql':
+            import_str = 'from pyPgSQL import PgSQL'
+            module_str = 'PgSQL'
+        else:
+            raise EnvironmentError, "Unknown PostgreSQL DB module '%s'" \
+                                    % self.module_name
+        
+        # import database module
+        exec import_str
+        m = eval(module_str)
+        
+        # get connection
+        self.db = m.connect(*self.args, **self.kargs)

trac/auth.py

@@ -32 +32 @@
-            cookie = req.incookie['trac_auth'].value
-            cursor.execute ("SELECT name FROM auth_cookie "
-                            "WHERE cookie=%s AND ipnr=%s"
+
-                            ,cookie, req.remote_addr)
-            row = cursor.fetchone()
-            if row:
-                self.authname = row[0]
-
+
-    def login(self, req):
-        cursor = self.db.cursor ()
-        cookie = util.hex_entropy()
-        cursor.execute ("INSERT INTO auth_cookie (cookie, name, ipnr, time)" +
-d
-
-
+s
+(
+,)
-        self.db.commit ()
-        self.authname = req.remote_user
-        req.outcookie['trac_auth'] = cookie
@@ -52 +54 @@
-    def logout(self):
-        cursor = self.db.cursor ()
-        cursor.execute ("DELETE FROM auth_cookie WHERE name=%s",
-self.authname
+(self.authname,)
-        self.db.commit ()

trac/Environment.py

@@ -34 +34 @@
-import Logging
-import Mimeview
-import unicodedata
+import db
-
-
+
-
-db_version = db_default.db_version
-
@@ -46 +47 @@
-    A Trac environment consists of a directory structure containing
-    among other things:
-     * a configuration file.
-sqlite 
+
-     * Project specific templates and wiki macros.
-     * wiki and ticket attachments.
-    """
-
+, db_str=None
-        self.path = path
-        if create:
-
+db_str
-        self.verify()
-        self.load_config()
-        try: # Use binary I/O on Windows
@@ -64 +65 @@
-            pass
-        self.setup_log()
-        self.setup_mimeviewer()
+        self.dbms = self.get_dbms()
-
-    def verify(self):
-        """Verifies that self.path is a compatible trac environment"""
@@ -71 +73 @@
-        assert fd.read(26) == 'Trac Environment Version 1'
-        fd.close()
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-        def _create_file(fname, data=None):
-            fd = open(fname, 'w')
-            if data: fd.write(data)
@@ -110 +134 @@
-                     'This directory contains project-specific custom templates and style sheet.\n')
-        _create_file(os.path.join(self.get_templates_dir(), 'site_header.cs'),
-                     """<?cs
-
-
-
-
+            
+            
+            
+            
-        _create_file(os.path.join(self.get_templates_dir(), 'site_footer.cs'),
-                     """<?cs
-
-
-
-
+            
+            
+            
+            
-        _create_file(os.path.join(self.get_templates_dir(), 'site_css.cs'),
-                     """<?cs
-
-
-
-
+            
+            
+            
+            
-        # Create default database
-        os.mkdir(os.path.join(self.path, 'db'))
-
+
+
+
+
+
+
-        cursor = cnx.cursor()
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        cnx.commit()
-
-    def insert_default_data(self):
@@ -138 +179 @@
-            if v == None:
-                return 'NULL'
-            else:
-
+
+
+
+
-        cnx = self.get_db_cnx()
-        cursor = cnx.cursor()
-        
@@ -149 +193 @@
-                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()
@@ -218 +263 @@
-        cursor = cnx.cursor()
-        cursor.execute('SELECT filename,description,type,size,time,author,ipnr '
-                       'FROM attachment '
-type, id
+(type, id,)
-        return cursor.fetchall()
-    
-    def get_attachments_hdf(self, cnx, type, id, hdf, prefix):
@@ -290 +335 @@
-
-    def backup(self, dest=None):
-        """Simple SQLite-specific backup. Copy the database file."""
-
+
+
-        if db_str[:7] != 'sqlite:':
-
+
+
+
+
+
-        db_name = os.path.join(self.path, db_str[7:])
-        if not dest:
-            dest = '%s.%i.bak' % (db_name, self.get_version())
@@ -321 +371 @@
-                    err = 'No upgrade module for version %i (%s.py)' % (i, upg)
-                    raise EnvironmentError, err
-                d.do_upgrade(self, i, cursor)
-i
+s
-                           "name='database_version'", db_default.db_version)
-            self.log.info('Upgraded db version from %d to %d',
-                          dbver, db_default.db_version)
-            cnx.commit()
+            print 'Upgrade succeeded.'
-            return 1

trac/Ticket.py

@@ -73 +73 @@
-            self[Ticket.std_fields[i]] = row[i] or ''
-
-        cursor = db.cursor ()
-i
+s
-        rows = cursor.fetchall()
-        if rows:
-            for r in rows:
@@ -93 +93 @@
-            if not dict.has_key(name):
-                self[name] = '0'
-
-
+, dbms
-        """Add ticket to database"""
-        cursor = db.cursor()
-        assert not self.has_key('id')
@@ -106 +106 @@
-        std_fields = filter(lambda n: n[:7] != 'custom_', self.keys())
-        custom_fields = filter(lambda n: n[:7] == 'custom_', self.keys())
-        std_values = map(lambda n, self=self: self[n], std_fields)
+        
-        nstr = string.join(std_fields, ',')
-        vstr = ('%s,' * len(std_fields))[:-1]
-
+ 
-                       *std_values)
-
+
+
+
+
+
+
+
+
-        for name in custom_fields:
-            cursor.execute('INSERT INTO ticket_custom(ticket,name,value)'
-d
+s
-        db.commit()
-        self['id'] = id
-        self._forget_changes()
@@ -149 +157 @@
-        for name in self._old.keys():
-            if name[:7] == 'custom_':
-                fname = name[7:]
-
+
+
+
+
+
+
+
+
+
+
-                               ' VALUES(%s, %s, %s)', id, fname, self[name])
-            else:
-                fname = name
-cursor.execute ('UPDATE ticket SET %s=%s WHERE id=%s',
-          
+sql = "UPDATE ticket SET %s='%s' WHERE id=%s" \
+% (
-
+                cursor.execute (sql)
+
-            cursor.execute ('INSERT INTO ticket_change '
-                            '(ticket, time, author, field, oldvalue, newvalue) '
-                            'VALUES (%s, %s, %s, %s, %s, %s)',
@@ -174 +193 @@
-        """Returns the changelog as a list of dictionaries"""
-        cursor = db.cursor()
-        if when:
-'SELECT time, author, field, oldvalue, newvalue '
-'FROM ticket_change '
-'WHERE ticket=%s AND time=%s'
-'UNION '
-'SELECT time, author, "attachment", null, filename '
-'FROM attachment '
-'WHERE id=%s AND time=%s '
-'ORDER BY time'
+"SELECT time, author, field, oldvalue, newvalue "
+"FROM ticket_change "
+"WHERE ticket=%s AND time=%s"
+"UNION "
+"SELECT time, author, 'attachment', null, filename "
+"FROM attachment "
+"WHERE id=%s AND time=%s "
+"ORDER BY time"
-        else:
-'SELECT time, author, field, oldvalue, newvalue '
-'FROM ticket_change '
-'WHERE ticket=%s '
-'UNION '
-'SELECT time, author, "attachment", null,filename '
-'FROM attachment '
-'WHERE id = %s '
-'ORDER BY time'
+"SELECT time, author, field, oldvalue, newvalue "
+"FROM ticket_change "
+"WHERE ticket=%s "
+"UNION "
+"SELECT time, author, 'attachment', null,filename "
+"FROM attachment "
+"WHERE id = %s "
+"ORDER BY time"
-        log = []
-        while 1:
-            row = cursor.fetchone()
@@ -286 +305 @@
-            owner = cursor.fetchone()[0]
-            ticket['owner'] = owner
-
-
+
+
-
-        # Notify
-        tn = TicketNotifyEmail(self.env)

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>
+
+
+"""
+
+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()