PostgresqlPatch: pgsql_patch_12.diff

scripts/trac-admin

@@ -27 +27 @@
-import time
-import cmd
-import shlex
-import sqlite
-import StringIO
+import traceback
-
-from trac import perm
-from trac import util
@@ -96 +96 @@
-            return 0
-        return 1
-        
-
+, db_str
-        try:
-create=1
+1, db_str
-            return self.__env
-        except Exception, e:
-            print 'Failed to create environment.', e
+            print traceback.print_exc()
-            sys.exit(1)
-
-    def db_open(self):
@@ -115 +116 @@
-
-    def db_execsql (self, sql, cursor=None):
-        data = []
+        row = None
-        if not cursor:
-            cnx=self.db_open()
-            cursor = cnx.cursor()
@@ -122 +124 @@
-            cnx = None
-        cursor.execute(sql)
-        while 1:
-
+
+
+
+
-            if row == None:
-                break
-            data.append(row)
@@ -455 +460 @@
-
-    ## 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):
@@ -488 +493 @@
-        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 " 'pypgsql' - 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 == "pypgsql":
+            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):
@@ -498 +558 @@
-        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'
+        
+        # postgres-specific stuff
+        if db_str.lower() == "pypgsql":
+            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 pypgsql): <host> <port> <database>' \
+                      ' <user> <password>'
+                return
+            else:
+                host = arg[4]
+                port = arg[5]
+                database = arg[6]
+                user = arg[7]
+                password = arg[8]
+            db_str = "pypgsql: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)
@@ -528 +630 @@
-            return
-        try:
-            print 'Creating and Initializing Project'
-
+
+
+
-            cnx = self.__env.get_db_cnx()
-            print ' Inserting default data'
-            self.__env.insert_default_data()
@@ -541 +645 @@
-            print '  project.name'
-            self.__env.set_config('project', 'name', project_name)
-            self.__env.save_config()
+            
-            # Add a few default wiki pages
-            print ' Installing wiki pages'
-            cursor = cnx.cursor()
@@ -550 +655 @@
-            sync.sync(cnx, rep, fs_ptr, pool)
-        except Exception, e:
-            print 'Failed to initialize database.', e
+            print traceback.print_exc()
-            sys.exit(2)
-
-
@@ -671 +777 @@
-                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'

setup.py

@@ -199 +199 @@
-      author_email="info@edgewall.com",
-      license=LICENSE,
-      url=URL,
-
+
+
-      data_files=[(_p('share/trac/templates'), glob('templates/*')),
-                  (_p('share/trac/htdocs'), glob(_p('htdocs/*.*')) + [_p('htdocs/README')]),
-                  (_p('share/trac/htdocs/css'), glob(_p('htdocs/css/*'))),

trac/db_default.py

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

trac/dbms/db_pypgsql.py

@@ +1 @@
+# -*- coding: iso8859-1 -*-
+#
+# Copyright (C) 2005 Edgewall Software
+# Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de>
+#
+# 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: Christopher Lenz <cmlenz@gmx.de>
+
+import os
+from pyPgSQL import PgSQL
+import string
+
+from trac import db_default
+
+from trac.db import ConnectionWrapper
+
+from trac.util import TracError
+
+class PyPgSQLConnection(ConnectionWrapper):
+    """
+    Connection wrapper for PostgreSQL using the PyPgSQL driver.
+    """
+
+    __slots__ = ['cnx']
+
+    def __init__(self, dbargs, env, create=0):
+        if create:
+            self.create_db(env.path, dbargs)
+        
+        # TODO: check to see if db exists, or throw error (see sqlite module)
+
+        args = self.parse_args(dbargs)
+                
+        cnx = PgSQL.connect("", **args)
+        ConnectionWrapper.__init__(self, cnx)
+
+    def get_last_id(self, table, field):
+        cursor = self.cursor()
+        sql = "SELECT %s FROM %s " \
+              "WHERE %s = CURRVAL('%s_%s_seq')" \
+              % (field, table, field, table, field)
+        cursor.execute(sql)
+        id = cursor.fetchone()[0]
+        cursor.close()
+        return id
+
+    def create_db(self, path, dbargs):
+        
+        # TODO: make the database
+        # Are we able to do this without su - postgres ??
+        # Should we move what's in trac-admin to here?  Probably...
+        
+        args = self.parse_args(dbargs)
+        
+        # get a connection
+        cnx = PgSQL.connect("", **args)
+        
+        # populate the default schema
+        schema = db_default.schema
+        sql = ""
+        
+        for tables in schema:
+            table = tables[0]
+            fields = tables[1]
+            sql_fields = []
+            unique = []
+            sql += "CREATE TABLE %s (\n" % table
+            
+            for field in fields:
+                name = field[0]
+                type = field[1]
+                size = field[2]
+                pk   = field[3]
+                
+                if type == 'auto':
+                    type = 'serial'
+                    
+                if pk == 'u':
+                    unique.append(name)
+                
+                sql_fields.append(" %s %s" % (name, type))
+                
+            if len(unique):
+                sql_fields.append(" CONSTRAINT %s_pkey PRIMARY KEY(%s)" % 
+                    (table, ",".join(unique)))
+            sql += ",\n".join(sql_fields)
+            sql += "\n);\n\n"
+            
+        cursor = cnx.cursor()
+        cursor.execute(sql)
+        cnx.commit()
+        
+        cursor.close()
+        cnx.close()
+
+    def parse_args(self, dbargs):
+        """very crude code for parsing the arguments in connect_params"""
+        
+        kargs = {}
+        args = dbargs.split(",")
+        
+        for arg in args:
+            pair = arg.split("=")
+            name = pair[0]
+            value = pair[1].strip("'")
+            kargs[name] = value
+            
+        return kargs
+ 
+    def get_search_fields(self):
+        return {'changeset' : 'cast(rev as text)',
+                'ticket'    : 'cast(a.id as text)'}
+                     
+    

trac/dbms/db_sqlite.py

@@ +1 @@
+# -*- coding: iso8859-1 -*-
+#
+# Copyright (C) 2005 Edgewall Software
+# Copyright (C) 2005 Christopher Lenz <cmlenz@gmx.de>
+#
+# 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: Christopher Lenz <cmlenz@gmx.de>
+
+import os
+import sqlite
+import string
+import traceback
+
+from trac import db_default
+
+from trac.db import ConnectionWrapper
+
+from trac.util import TracError
+
+class SQLiteConnection(ConnectionWrapper):
+    """
+    Connection wrapper for SQLite.
+    """
+
+    __slots__ = ['cnx']
+
+    def __init__(self, dbpath, env, create=0, timeout=10000):
+        
+        if create:
+            self.create_db(env.path, dbpath)
+        
+        if dbpath != ':memory:':
+            if not os.access(dbpath, os.F_OK):
+                raise TracError, traceback.print_exc()
+                raise TracError, 'Database "%s" not found.' % dbpath
+            
+            dbdir = os.path.dirname(dbpath)
+            if not os.access(dbpath, os.R_OK + os.W_OK) or \
+                   not os.access(dbdir, os.R_OK + os.W_OK):
+                raise TracError, 'The web server user requires read _and_ ' \
+                                 'write permission to the database %s and ' \
+                                 'the directory this file is located in.' \
+                                 % dbpath
+
+        import sqlite
+        cnx = sqlite.connect(dbpath, timeout=timeout)
+        ConnectionWrapper.__init__(self, cnx)
+
+    def get_last_id(self, table, field):
+        return self.cnx.db.sqlite_last_insert_rowid()
+        
+    def create_db(self, path, dbpath):
+        
+        # make the directory to hold the database
+        os.mkdir(os.path.join(path, 'db'))
+        
+        # create the database by getting a connection
+        cnx = sqlite.connect(dbpath, timeout=100)
+        
+        # populate the default schema
+        schema = db_default.schema
+        sql = ""
+        
+        for tables in schema:
+            table = tables[0]
+            fields = tables[1]
+            sql_fields = []
+            unique = []
+            sql += "CREATE TABLE %s (\n" % table
+            
+            for field in fields:
+                name = field[0]
+                type = field[1]
+                size = field[2]
+                pk   = field[3]
+                
+                if type == 'auto':
+                    type = 'INTEGER PRIMARY KEY'
+                    
+                if pk == 'u':
+                    unique.append(name)
+                
+                sql_fields.append(" %s %s" % (name, type))
+                
+            if len(unique):
+                sql_fields.append(" UNIQUE(%s)" % ",".join(unique))
+            sql += ",\n".join(sql_fields)
+            sql += "\n);\n\n"
+            
+        cursor = cnx.cursor()
+        cursor.execute(sql)
+        cnx.commit()
+        
+        cursor.close()
+        cnx.close()
+
+    def get_search_fields(self):
+        return {'changeset' : 'rev',
+                'ticket'    : 'a.id'}
+        

trac/Search.py

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

trac/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

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

trac/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.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Visit the Trac Project at http://trac.edgewall.com/
-

trac/tests/environment.py

@@ -39 +39 @@
-
-    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

@@ -45 +45 @@
-        self.assertEqual(sql,
-"""SELECT id,summary,status,owner,priority,milestone,component,time,changetime
-FROM ticket
-
+e 
-ORDER BY COALESCE(priority,'')='',priority_value,id""")
-