PostgresqlPatch: pgsql_patch_03.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
@@ -448 +448 @@
-
-    ## 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):
@@ -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',
@@ -998 +1092 @@
-                    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

@@ -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)
+) 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
-##
@@ -413 +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/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/Report.py

@@ -140 +140 @@
-
-        # 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/sync.py

@@ -35 +35 @@
-              (util.SVN_VER_MAJOR, util.SVN_VER_MINOR, util.SVN_VER_MICRO)
-
-    cursor = db.cursor()
-ifnull
+COALESCE
-    youngest_stored =  int(cursor.fetchone()[0])
-    max_rev = fs.youngest_rev(fs_ptr, pool)
-    num = max_rev - youngest_stored

trac/util.py

@@ -329 +329 @@
-        d[k] = v
-    return d
-
+def get_next_key(db, table, key_column='id', cursor=None):
+    '''Provides a very basic way of getting the next available key for a particular table.'''
-
+    # the currently implementation here is a hack, this should be upgraded to
+    # use something like a separate table to maintain next_key references, but
+    # even this hack should work fine unless millions of records are getting
+    # inserted simultaneously
+    
+    if cursor == None:
+        cursor = db.cursor()
+    cursor.execute('select max(%s) + 1 as next_key from %s' % (key_column, table))
+    row = cursor.fetchone()
+    next_key = row[0]
+
+    if next_key == None:
+        next_key = 1
+        
+    return next_key
+
-if __name__ == '__main__ ':
-    pass
-    #print pre

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

@@ -40 +40 @@
-        cursor = self.db.cursor ()
-        cookie = util.hex_entropy()
-        cursor.execute ("INSERT INTO auth_cookie (cookie, name, ipnr, time)" +
-d
+s
-                        cookie, req.remote_user, req.remote_addr,
-                        int(time.time()));
-        self.db.commit ()

trac/Environment.py

@@ -46 +46 @@
-    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 +64 @@
-            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 +72 @@
-        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)
@@ -128 +197 @@
-""")
-        # Create default database
-        os.mkdir(os.path.join(self.path, 'db'))
-
+
+
+
+
+
+
-        cursor = cnx.cursor()
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        cnx.commit()
-
-    def insert_default_data(self):
@@ -138 +224 @@
-            if v == None:
-                return 'NULL'
-            else:
-
+
+
+
+
-        cnx = self.get_db_cnx()
-        cursor = cnx.cursor()
-        
@@ -149 +238 @@
-                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()
@@ -290 +380 @@
-
-    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 +416 @@
-                    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

@@ -35 +35 @@
-
-
-class Ticket(UserDict):
-
+id', '
-                  'reporter', 'owner', 'cc', 'url', 'version', 'status', 'resolution',
-                  'keywords', 'summary', 'description']
-
@@ -73 +73 @@
-            self[Ticket.std_fields[i]] = row[i] or ''
-
-        cursor = db.cursor ()
-i
+s
-        rows = cursor.fetchall()
-        if rows:
-            for r in rows:
@@ -96 +96 @@
-    def insert(self, db):
-        """Add ticket to database"""
-        cursor = db.cursor()
-
+# 
-
-        # Add a timestamp
-        now = int(time.time())
-        self['time'] = now
-        self['changetime'] = now
-
+        self['id'] = util.get_next_key(db, 'ticket')
+
-        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, %s)', id
+s, %s, %s)', self['id']
-        db.commit()
-        self['id'] = id
-        self._forget_changes()
-id
+self['id']
-
-    def save_changes(self, db, author, comment, when = 0):
-        """Store ticket changes in the database.
@@ -171 +173 @@
-        """Returns the changelog as a list of dictionaries"""
-        cursor = db.cursor()
-        if when:
-'SELECT time, author, field, oldvalue, newvalue '