SF.net SVN: mailmanager: [3019] MailManager/branches/RELENG_2_1

[<ke...@us...>]

Revision: 3019
Author:   kevca
Date:     2006-05-22 06:00:53 -0700 (Mon, 22 May 2006)
ViewCVS:  http://svn.sourceforge.net/mailmanager/?rev=3019&view=rev

Log Message:
-----------
fix for
- Migration from 2.0 broken (#1492890)

Modified Paths:
--------------
    MailManager/branches/RELENG_2_1/CHANGES.txt
    MailManager/branches/RELENG_2_1/migrations/v2_0/__init__.py
    MailManager/branches/RELENG_2_1/sql/__init__.py
Modified: MailManager/branches/RELENG_2_1/CHANGES.txt
===================================================================
--- MailManager/branches/RELENG_2_1/CHANGES.txt	2006-05-22 11:09:39 UTC (rev 3018)
+++ MailManager/branches/RELENG_2_1/CHANGES.txt	2006-05-22 13:00:53 UTC (rev 3019)
@@ -7,6 +7,7 @@
 - Postgres encoding may still be in native charset (#1490182)
 - Timestamps are not formatted correctly (#1484503)
 - Incorrect abilities for new accounts (#1492592)
+- Migration from 2.0 broken (#1492890)
 * BUG FIXES From 2.0.8 to 2.0.9
 
 Version 2.1-RC3

Modified: MailManager/branches/RELENG_2_1/migrations/v2_0/__init__.py
===================================================================
--- MailManager/branches/RELENG_2_1/migrations/v2_0/__init__.py	2006-05-22 11:09:39 UTC (rev 3018)
+++ MailManager/branches/RELENG_2_1/migrations/v2_0/__init__.py	2006-05-22 13:00:53 UTC (rev 3019)
@@ -461,6 +461,7 @@
 
 
     if self.mversion == 'v2_0_15':
+
         # Conversion to the 2.1 release
         # This is the last migration in the 2.0 series, and moves the 
         # migration system onto 2.1 properly. Some significant changes
@@ -473,6 +474,20 @@
         self.sql.createRulesetTables()
         self.sql.createQueueingTables()
 
+        # Replace cookiecrumbler with session handler
+        self.sql.createSessionTables()
+        self.manage_delObjects(['Cookie'])
+        
+        manage_addLoginHandler(self, 'Cookie')
+        self.Cookie.auto_login_page = 'Login'
+        self.Cookie.logout_page = 'LoggedOut'
+
+        # Add in the tab information to the database
+        self.sql.createViewsTables()
+
+
+        self.configureDatabasePlatform(self.dbplatform, version='v2_1')
+
         # Add in the base reporting engine
         manage_addQueueReportingEngine(self, 'Reports', 'Reports')
 
@@ -480,9 +495,6 @@
         manage_addRulesetEngine(self, 'engine', 'Ruleset Engine')
         self.engine.setup(rsname='queuesystem')
 
-        # Add in the tab information to the database
-        self.sql.createViewsTables()
-
         # Create the default tab views
         self.sql.addTab(sqv_id = 'Tickets',  sqv_title = 'Tickets',  sqv_url = 'Tickets',       sqv_accesskey = 't', sqv_roles = 'Tickets Customer')
         self.sql.addTab(sqv_id = 'Search',   sqv_title = 'Search',   sqv_url = 'Search',        sqv_accesskey = 'f', sqv_roles = 'Tickets Customer')
@@ -524,16 +536,6 @@
         del self.display_column['status']
         self._p_changed = 1
 
-        # Replace cookiecrumbler with session handler
-        self.sql.createSessionTables()
-        self.manage_delObjects(['Cookie'])
-        
-        manage_addLoginHandler(self, 'Cookie')
-        self.Cookie.auto_login_page = 'Login'
-        self.Cookie.logout_page = 'LoggedOut'
-        
-    self.configureDatabasePlatform(self.dbplatform, version='v2_1')
-
     # Update the mversion to show we are complete
     self.mversion = 'v2_1_0'
  

Modified: MailManager/branches/RELENG_2_1/sql/__init__.py
===================================================================
--- MailManager/branches/RELENG_2_1/sql/__init__.py	2006-05-22 11:09:39 UTC (rev 3018)
+++ MailManager/branches/RELENG_2_1/sql/__init__.py	2006-05-22 13:00:53 UTC (rev 3019)
@@ -59,13 +59,14 @@
 
 class MailManagerSQL(OFS.Folder.Folder):
 
-    sqlmethods = [i.split('.', 1)[0] for i in os.listdir(os.path.join(package_home(globals()),'v2_1')) if i.endswith('.zsql')]
+    def __init__(self, id=None, version='v2_1'):
 
-    def __init__(self, id=None, version='v2_1'):
+        self.sqlmethods = [i.split('.', 1)[0] for i in os.listdir(os.path.join(package_home(globals()), version)) if i.endswith('.zsql')]
+
         if id is not None:
             self.id = str(id)
         for method in self.sqlmethods: 
-            zfsm = FSZSQLWrapper(method, os.path.join('MailManager', 'sql', version, '%s.zsql' % method))
+            zfsm = FSZSQLWrapper(method, os.path.join(package_home(globals()), version, '%s.zsql' % method))
             self._setObject(method, zfsm)
 
     def listCustFolderPaths(self, adding_meta_type=None):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.