PostgresqlPatch: pgsql_patch_02.diff

scripts/trac-admin

@@ -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
@@ -481 +481 @@
-        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 host [%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 host [%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 host [%s]> " % password
+            returnvals.append(raw_input(prompt) or password)
+            
-        return returnvals
-         
-    def do_initenv(self, line):
@@ -491 +546 @@
-        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]
+        
+        # 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)
@@ -521 +614 @@
-            return
-        try:
-            print 'Creating and Initializing Project'
-
+db_str
-            cnx = self.__env.get_db_cnx()
-            print ' Inserting default data'
-            self.__env.insert_default_data()
@@ -685 +778 @@
-        data = data.replace("'", "''") # Escape ' for safe SQL
-        f.close()
-        
-
-
-
+
+
+
+
-               % {'title':title,
-                  'time':int(time.time()),
-                  'author':'trac',

trac/core.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-
-import os
-import re

trac/db_default.py

@@ -127 +127 @@
-         name            text PRIMARY KEY,
-         owner           text
-);
+
-CREATE TABLE milestone (
-         id              integer PRIMARY KEY,
-         name            text,
-
-
+
+
+
-         UNIQUE(name)
-);
-CREATE TABLE version (
@@ -175 +176 @@
-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)
+) WITHOUT OIDS;
+
+CREATE TABLE node_change (
+        rev             integer,
+        name            text,
+        change          char(1),
+        CONSTRAINT node_change_pkey PRIMARY KEY (rev, name, change)
+) WITHOUT OIDS;
+
+CREATE TABLE auth_cookie (
+        cookie          text,
+        name            text,
+        ipnr            text,
+        time            integer,
+        CONSTRAINT auth_cookie_pkey PRIMARY KEY(cookie, name, ipnr)
+) WITHOUT OIDS;
+
+CREATE TABLE enum (
+        type            text,
+        name            text,
+        value           text,
+        CONSTRAINT enum_pkey PRIMARY KEY(name,type)
+) WITHOUT OIDS;
+
+CREATE TABLE system (
+        name            text,
+        value           text,
+        CONSTRAINT system_pkey PRIMARY KEY(name)
+) WITHOUT OIDS;
+
+CREATE TABLE lock (
+        name            text,
+        owner           text,
+        ipnr            text,
+        time            integer,
+        CONSTRAINT lock_pkey PRIMARY KEY(name)
+) WITHOUT OIDS;
+
+CREATE TABLE ticket (
+        id              integer,
+        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)
+) WITHOUT OIDS;
+
+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)
+) WITHOUT OIDS;
+
+CREATE TABLE ticket_custom (
+       ticket               integer,
+       name             text,
+       value            text,
+       CONSTRAINT ticket_custom_pkey PRIMARY KEY(ticket,name)
+) WITHOUT OIDS;
+
+CREATE TABLE report (
+        id              integer,
+        author          text,
+        title           text,
+        sql             text,
+        description     text,
+        CONSTRAINT report_pkey PRIMARY KEY(id)
+) WITHOUT OIDS;
+
+CREATE TABLE permission (
+        username        text,           -- 
+        action          text,           -- allowable activity
+        CONSTRAINT permission_pkey PRIMARY KEY(username,action)
+) WITHOUT OIDS;
+
+CREATE TABLE component (
+         name            text,
+         owner           text,
+         CONSTRAINT component_pkey PRIMARY KEY(name)
+) WITHOUT OIDS;
+
+CREATE TABLE milestone (
+         name            text,
+         due             integer, -- Due date/time
+         completed       integer, -- Completed date/time
+         description     text,
+         CONSTRAINT milestone_pkey PRIMARY KEY(name)
+) WITHOUT OIDS;
+
+CREATE TABLE version (
+         name            text,
+         time            integer,
+         CONSTRAINT version_pkey PRIMARY KEY(name)
+) WITHOUT OIDS;
+
+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)
+) WITHOUT OIDS;
+
+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)
+) WITHOUT OIDS;
+
+CREATE TABLE session (
+         sid             text,
+         username        text,
+         var_name        text,
+         var_value       text,
+         CONSTRAINT session_pkey PRIMARY KEY(sid,var_name)
+) WITHOUT OIDS;
+
+"""
+
-##
-## Default Reports
-##
@@ -351 +504 @@
-               (('component1', 'somebody'),
-                ('component2', 'somebody'))),
-           ('milestone',
-
-
-
-
-
-
+
+
+
+
+
-           ('version',
-             ('name', 'time'),
-               (('', 0),
@@ -414 +566 @@
- (('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/Milestone.py

@@ -157 +157 @@
-        cursor = self.db.cursor()
-        self.log.debug("Creating new milestone '%s'" % name)
-        cursor.execute("INSERT INTO milestone (id, name, due, description) "
-d
+s
-        self.db.commit()
-        self.req.redirect(self.env.href.milestone(name))
-
@@ -208 +208 @@
-        groups = []
-        if by in ['status', 'resolution', 'severity', 'priority']:
-            cursor.execute("SELECT name FROM enum WHERE type = %s "
-IFNULL
+COALESCE
-        elif by in ['component', 'milestone', 'version']:
-            cursor.execute("SELECT name FROM %s "
-IFNULL
+COALESCE
-        elif by == 'owner':
-            cursor.execute("SELECT DISTINCT owner AS name FROM ticket "
-                           "ORDER BY owner")

trac/Query.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-
-from __future__ import nested_scopes
-from time import gmtime, localtime, strftime
@@ -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]:
-            sql.append("\n  LEFT OUTER JOIN (SELECT name AS %s_name, " \
-
+ other
-                       " ON %s_name=%s" % (col, col, col, col, col))
-
-        def get_constraint_sql(name, value, mode, neg):
-            value = sql_escape(value[len(mode and '!' or '' + mode):])
-            if mode == '~' and value:
-IFNULL
+COALESCE
-                       name, neg and 'NOT ' or '', value)
-            elif mode == '^' and value:
-IFNULL
+COALESCE
-                       name, neg and 'NOT ' or '', value)
-            elif mode == '$' and value:
-IFNULL
+COALESCE
-                       name, neg and 'NOT ' or '', value)
-            elif mode == '':
-IFNULL
+COALESCE
-
-        clauses = []
-        for k, v in self.constraints.items():
@@ -194 +194 @@
-            # Special case for exact matches on multiple values
-            if not mode and len(v) > 1:
-                inlist = ",".join(["'" + sql_escape(val[neg and 1 or 0:]) + "'" for val in v])
-IFNULL
+COALESCE
-            elif len(v) > 1:
-                constraint_sql = [get_constraint_sql(k, val, mode, neg) for val in v]
-                if neg:
@@ -214 +214 @@
-            order_cols.insert(0, (self.group, self.groupdesc))
-        for col, desc in order_cols:
-            if desc:
-IFNULL
+COALESCE
-            else:
-IFNULL
+COALESCE
-            if col in ['status', 'resolution', 'priority', 'severity']:
-                if desc:
-                    sql.append("%s_value DESC" % col)
@@ -224 +224 @@
-                    sql.append("%s_value" % col)
-            elif col in ['milestone', 'version']:
-                if desc:
-IFNULL
+COALESCE
-                               % (col, col, col))
-                else:
-IFNULL
+COALESCE
-                               % (col, col, col))
-            else:
-                if desc:

trac/Report.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-
-import os
-import re
@@ -95 +95 @@
-            sql = 'SELECT id AS report, title FROM report ORDER BY report'
-            description = 'This is a list of reports available.'
-        else:
-
-
+
+
+
-            row = cursor.fetchone()
-            if not row:
-                raise util.TracError('Report %d does not exist.' % id,
@@ -133 +134 @@
-        sql = self.sql_sub_vars(sql, args)
-        if not sql:
-            raise util.TracError('Report %s has no SQL query.' % id)
+        self.env.log.debug("sql: %s" % sql)
-        cursor.execute(sql)
-
-        if sql.find('__group__') == -1:
@@ -140 +142 @@
-
-        # FIXME: fetchall should probably not be used.
-        info = cursor.fetchall()
-
+
+
-        # Escape the values so that they are safe to have as html parameters
-        #info = map(lambda row: map(lambda x: escape(x), row), info)
-

trac/sync.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-
-from svn import fs, util, delta, repos, core
+from util import sql_escape
-
-import posixpath
-
@@ -35 +36 @@
-              (util.SVN_VER_MAJOR, util.SVN_VER_MINOR, util.SVN_VER_MICRO)
-
-    cursor = db.cursor()
-
-
+
+
+
+
+
+
-    max_rev = fs.youngest_rev(fs_ptr, pool)
-    num = max_rev - youngest_stored
-    offset = youngest_stored + 1
@@ -52 +57 @@
-
-        date = util.svn_time_from_cstring(date, subpool) / 1000000
-        
-
-
-
+
+
+
+
-        insert_change (subpool, fs_ptr, rev + offset, cursor)
-        core.svn_pool_clear(subpool)
-

trac/Session.py

@@ -21 +21 @@
-
-import sys
-import time
-
+, sql_escape
-
-class Session:
-    """Basic session handling and per-session storage."""
@@ -104 +104 @@
-        self.sid = sid
-        curs = self.db.cursor()
-        curs.execute("SELECT username,var_name,var_value FROM session"
-%s",
+'%s'" %
-        rows = curs.fetchall()
-        if (not rows                              # No session data yet
-            or rows[0][0] == 'anonymous'          # Anon session
@@ -136 +136 @@
-        if currval == None:
-            if key == 'last_visit': # Limit the frequency of purging
-                self.purge_expired() 
-
-
-
+
+
+
+
+
+
+
-        else:
-
-
-
+
+
+
+
+
+
+
+
-        self.db.commit()
-        self.vars[key] = val
-

trac/Roadmap.py

@@ -44 +44 @@
-        if show == 'all':
-            icalhref += '&show=all'
-            query = "SELECT name,due,completed,description FROM milestone " \
-IFNULL
-IFNULL
+COALESCE
+COALESCE
-        else:
-            self.req.hdf.setValue('roadmap.showall', '1')
-            query = "SELECT name,due,completed,description FROM milestone " \
-IFNULL
-IFNULL
-IFNULL
+COALESCE
+COALESCE
+COALESCE
-
-        if self.req.authname and self.req.authname != 'anonymous':
-            icalhref += '&user=' + self.req.authname

trac/auth.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-
-import time
-import util
@@ -30 +30 @@
-        if req.incookie.has_key('trac_auth'):
-            cursor = db.cursor ()
-            cookie = req.incookie['trac_auth'].value
-
-
-
+
+
+
+
-            if cursor.rowcount >= 1:
-                self.authname = cursor.fetchone()[0]
-
-    def login(self, req):
-        cursor = self.db.cursor ()
-        cookie = util.hex_entropy()
-
-
-
-
+
+
+
+
+
+
+
+
+
-        self.db.commit ()
-        self.authname = req.remote_user
-        req.outcookie['trac_auth'] = cookie

trac/Wiki.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-
-import os
-import time
@@ -27 +27 @@
-
-import perm
-from Module import Module
-
+, sql_escape
-from Session import Session
-from WikiFormatter import *
-
@@ -56 +56 @@
-        self.name = name
-        self.perm = perm
-        cursor = self.db.cursor ()
+        sql = "SELECT version, text, readonly FROM wiki "
-        if version:
-
-
-
+
-        else:
-cursor.execute ('SELECT version, text, readonly FROM wiki '
-                    'WHERE name=%s ORDER BY version DESC LIMIT 1', name
+sql += "WHERE name='%s' ORDER BY version DESC LIMIT 1" % name
+cursor.execute(sql
-        row = cursor.fetchone()
-        if row:
-            self.new = 0
@@ -102 +101 @@
-            self.db.commit ()
-            self.old_readonly = self.readonly
-        elif self.modified:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            self.db.commit ()
-            self.old_readonly = self.readonly
-            self.modified = 0
@@ -124 +127 @@
-        This information is used to present a changelog/history for a given page
-        """
-        cursor = self.db.cursor ()
-
-
+
+
+
-        i = 0
-        while 1:
-            row = cursor.fetchone()
@@ -155 +159 @@
-           self.req.redirect(self.env.href.wiki(pagename, version, 1))
-
-        cursor = self.db.cursor()
-
-
-
+
+
+
+
-        res = cursor.fetchall()
-        if not res:
-            raise TracError('Version %d of page "%s" not found.'
-                            % (version, pagename),
-                            'Page Not Found')
-
+
-        if len(res) == 1:
-            old = ''
-        else:

trac/Environment.py

@@ -1 +1 @@
-# -*- coding: iso8859-1 -*-
-#
-# Copyright (C) 2003, 2004 Edgewall Software
-ö
+?
-#
-# Trac is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
@@ -17 +17 @@
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-ö
+?
-#
-# Todo: Move backup and upgrade from db.py
-#
@@ -50 +50 @@
-     * 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
@@ -71 +71 @@
-        assert fd.read(26) == 'Trac Environment Version 1'
-        fd.close()
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+