PostgresqlPatch: pgsql_patch_06.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'
@@ -694 +797 @@
-        data = data.replace("'", "''") # Escape ' for safe SQL
-        f.close()
-        
-
-
-
+
+
+
+
-               % {'title':title,
-                  'time':int(time.time()),
-                  'author':'trac',
@@ -799 +903 @@
-
-    def _do_enum_add(self, type, name):
-        sql = ("INSERT INTO enum('value','type','name') "
-ifnull
+COALESCE
-               "   FROM enum WHERE type='%(type)s'" 
-               % {'type':type,
-                  'name':name})
@@ -867 +971 @@
-
-    def _do_milestone_list(self):
-        data = self.db_execsql("SELECT name,due,completed FROM milestone "
-IFNULL
+COALESCE
-        data = map(lambda x: (x[0], x[1] and time.strftime('%c', time.localtime(x[1])),
-                              x[2] and time.strftime('%c', time.localtime(x[2]))), data)
-        self.print_listing(['Name', 'Due', 'Completed'], data)
@@ -1007 +1111 @@
-                    print "Upgrade: Backup of old database saved in " \
-                          "%s/db/trac.db.%i.bak" % (self.envname, curr)
-                else:
-a
+e
-                self.__env.upgrade(do_backup)
-            else:
-                print "Upgrade: Database is up to date, no upgrade necessary."

trac/db_default.py

@@ -30 +30 @@
-    result = []
-    i = 1
-    for r in reps:
-i, 
+
-        i = i + 1
-    return result
-
@@ -174 +174 @@
-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
-##
@@ -295 +449 @@
-  FROM ticket t,enum p
-  WHERE p.name=t.priority AND p.type='priority'
-  ORDER BY (milestone IS NULL), milestone DESC, (status = 'closed'), 
-modified ELSE -
+changetime ELSE (-1)*
-"""),
-#----------------------------------------------------------------------------
-('My Tickets',
@@ -406 +560 @@
-             ('name', 'value'),
-               (('database_version', str(db_version)),)),
-           ('report',
-id', '
+
-               __mkreports(reports)))
-
-default_config = \
- (('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 (name,due,completed,description) "
-d,%d
+s,%s
-                       description)
-        self.db.commit()
-        self.req.redirect(self.env.href.milestone(name))
@@ -196 +196 @@
-                          'associated with milestone %s' % id)
-            cursor.execute("UPDATE ticket SET milestone = %s "
-                           "WHERE milestone = %s", name, id)
-d
-d
+s
+s
-                           name, due, completed, description, id)
-            self.db.commit()
-            self.req.redirect(self.env.href.milestone(name))
@@ -209 +209 @@
-        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/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):
-            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():
@@ -195 +195 @@
-            # 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 @@
-        if self.group and self.group != self.order:
-            order_cols.insert(0, (self.group, self.groupdesc))
-        for col, desc in order_cols:
-
-
+
+
+
+
+
+
+
+
-            else:
-
+
+
+
+
-            if col in ['status', 'resolution', 'priority', 'severity']:
-                if desc:
-                    sql.append("%s_value DESC" % col)
@@ -225 +234 @@
-                    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/Timeline.py

@@ -142 +142 @@
-                if max_node != 0:
-                    cursor_node = self.db.cursor ()
-                    cursor_node.execute("SELECT name, change "
-d" %
+s",
-                    node_list = ''
-                    node_data = ''
-                    node_count = 0;

trac/Report.py

@@ -110 +110 @@
-    def create_report(self, title, description, sql):
-        self.perm.assert_permission(perm.REPORT_CREATE)
-
+        dbms = self.env.get_dbms()
-        cursor = self.db.cursor()
-
-
-
+
+
+
+
+
+
+
+
+
+
-        self.db.commit()
-        self.req.redirect(self.env.href.report(id))
-
@@ -140 +148 @@
-
-        # FIXME: fetchall should probably not be used.
-        info = cursor.fetchall()
-rs.col_defs
+description
-        # 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/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

@@ -11 +11 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component
-FROM ticket
-IFNULL(id,'')=''
+COALESCE(id,0)=0
-
-    def test_all_ordered_by_id_desc(self):
-        query = Query(self.env, order='id', desc=1)
@@ -19 +19 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component
-FROM ticket
-IFNULL(id,'')=''
+COALESCE(id,0)=0
-
-    def test_all_ordered_by_id_verbose(self):
-        query = Query(self.env, order='id', verbose=1)
@@ -27 +27 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component,reporter,time,description
-FROM ticket
-IFNULL(id,'')=''
+COALESCE(id,0)=0
-
-    def test_all_ordered_by_priority(self):
-        query = Query(self.env) # priority is default order
@@ -35 +35 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component
-FROM ticket
-
-IFNULL
+e 
+COALESCE
-
-    def test_all_ordered_by_priority_desc(self):
-        query = Query(self.env, desc=1) # priority is default order