Changeset 3063

Timestamp:

01/15/08 18:15:28 (1 year ago)

Author:

coling

Message:

Hopefully fix #2418 by renaming the column 'user' to 'worker'. This requires some jiggery pokery in the db upgrade/install script in order to remain cross db-backend compatible (if it even is in the first place.... ;))

Files:

• worklogplugin/0.11/worklog/api.py (modified) (4 diffs)
• worklogplugin/0.11/worklog/manager.py (modified) (6 diffs)
• worklogplugin/0.11/worklog/timeline_hook.py (modified) (1 diff)

worklogplugin/0.11/worklog/api.py

@@ -29 +29 @@
-    def __init__(self):
-        self.db_version_key = 'WorklogPlugin_Db_Version'
-2
+3
-        self.db_installed_version = None
-
@@ -73 +73 @@
-        # Do the staged updates
-        try:
+            # This var is to deal with a problem case with pgsql and the "user"
+            # keyword. We need to skip over new installations but not upgrades
+            # for other db backends.
+            skip = False
+            
-            if self.db_installed_version < 1:
-                print 'Creating work_log table'
-                cursor.execute('CREATE TABLE work_log ('
-user  
+worker
-                               'ticket     INTEGER,'
-                               'lastchange INTEGER,'
@@ -82 +87 @@
-                               'endtime    INTEGER'
-                               ')')
+                skip = True
-
-            if self.db_installed_version < 2:
@@ -88 +94 @@
-                               'ADD COLUMN comment TEXT')
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            #    cursor.execute('...')
-            

worklogplugin/0.11/worklog/manager.py

@@ -143 +143 @@
- 
-        cursor = db.cursor()
-us
+work
-                       'VALUES (%s, %s, %s, %s, %s)',
-                       (self.authname, ticket, self.now, self.now, 0))
@@ -172 +172 @@
-        cursor.execute('UPDATE work_log '
-                       'SET endtime=%s, lastchange=%s, comment=%s '
-us
+work
-                       (stoptime, stoptime, comment, self.authname, active['lastchange']))
-        db.commit()
@@ -222 +222 @@
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-us
+work
-        try:
-            who,since = cursor.fetchone()
@@ -239 +239 @@
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-us
+work
-        row = cursor.fetchone()
-        if not row or not row[0]:
@@ -247 +247 @@
-    
-        task = {}
-us
+work
-                       'FROM work_log wl '
-                       'LEFT JOIN ticket t ON wl.ticket=t.id '
-us
+work
-
-        for user,ticket,summary,lastchange,starttime,endtime,comment in cursor:
@@ -281 +281 @@
-        cursor = db.cursor()
-        if mode == 'user':
-us
+work
-                           'FROM work_log wl '
-                           'INNER JOIN ticket t ON wl.ticket=t.id '
-us
-us
+work
+work
-                           'ORDER BY wl.lastchange DESC', (self.authname,))
-        elif mode == 'summary':
-us
-user,MAX(lastchange) lastchange FROM work_log GROUP BY us
-user=wl.us
+work
+worker,MAX(lastchange) lastchange FROM work_log GROUP BY work
+worker=wl.work
-                           'INNER JOIN ticket t ON wl.ticket=t.id '
-us
-us
+work
+work
-        else:
-us
+work
-                           'FROM work_log wl '
-                           'INNER JOIN ticket t ON wl.ticket=t.id '
-us
-us
+work
+work
-        
-        rv = []

worklogplugin/0.11/worklog/timeline_hook.py

@@ -34 +34 @@
-            cursor = db.cursor()
-
-us
+work
-                             FROM (
-                             
-us
+work
-                             FROM work_log
-
-                             UNION
-
-us
+work
-                             FROM work_log
-