SF.net SVN: mailmanager: [3275] MailManager/branches/RELENG_2_2/tests

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

Revision: 3275
Author:   kevca
Date:     2006-06-29 07:57:50 -0700 (Thu, 29 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/mailmanager/?rev=3275&view=rev

Log Message:
-----------
Up to rev 3274
Fixes MySQL support

ViewCVS Links:
-------------
    http://svn.sourceforge.net/mailmanager/?rev=3274&view=rev

Modified Paths:
--------------
    MailManager/branches/RELENG_2_2/sql/v2_1/deleteTickets.zsql
    MailManager/branches/RELENG_2_2/sql/v2_1/migrateUserGroupNameSizes.zsql
    MailManager/branches/RELENG_2_2/tests/testQueueing.py
Modified: MailManager/branches/RELENG_2_2/sql/v2_1/deleteTickets.zsql
===================================================================
--- MailManager/branches/RELENG_2_2/sql/v2_1/deleteTickets.zsql	2006-06-29 14:54:31 UTC (rev 3274)
+++ MailManager/branches/RELENG_2_2/sql/v2_1/deleteTickets.zsql	2006-06-29 14:57:50 UTC (rev 3275)
@@ -145,8 +145,38 @@
         <dtml-and>
           <dtml-sqltest sqv_category2 column="category2" type="nb" optional>
         </dtml-sqlgroup>
-    ) <dtml-var sql_delimiter>
+    )  <dtml-var sql_delimiter>
 
+
+<dtml-comment>
+ Fix needed for dealing with self referential tables, please see 
+ Please see http://sql-info.de/mysql/referential-integrity.html and
+ http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html
+</dtml-comment>
+
+<dtml-if expr="sql_database == 'mysql'">
+    UPDATE <dtml-var schema>mm_ticket SET support_of = NULL
+        <dtml-sqlgroup where>
+          <dtml-if sqv_date_opened>
+            date_opened <= (SELECT CAST(<dtml-sqlvar sqv_date_opened type="nb"> AS <dtml-var sql_datetimestamp>))
+          </dtml-if>
+        <dtml-and>
+          <dtml-sqltest sqv_ticket_id column="id" type="nb" optional>
+        <dtml-and>
+          <dtml-sqltest sqv_account_id column="account_id" type="nb" optional>
+        <dtml-and>
+          <dtml-sqltest sqv_state column="state" type="nb" multiple optional>
+        <dtml-and>
+          <dtml-sqltest sqv_category0 column="category0" type="nb" optional>
+        <dtml-and>
+          <dtml-sqltest sqv_category1 column="category1" type="nb" optional>
+        <dtml-and>
+          <dtml-sqltest sqv_category2 column="category2" type="nb" optional>
+        </dtml-sqlgroup>
+    <dtml-var sql_delimiter>
+        
+</dtml-if>
+
 DELETE FROM <dtml-var schema>mm_ticket
         <dtml-sqlgroup where>
           <dtml-if sqv_date_opened>
@@ -167,3 +197,4 @@
         </dtml-sqlgroup>
 
 
+

Modified: MailManager/branches/RELENG_2_2/sql/v2_1/migrateUserGroupNameSizes.zsql
===================================================================
--- MailManager/branches/RELENG_2_2/sql/v2_1/migrateUserGroupNameSizes.zsql	2006-06-29 14:54:31 UTC (rev 3274)
+++ MailManager/branches/RELENG_2_2/sql/v2_1/migrateUserGroupNameSizes.zsql	2006-06-29 14:57:50 UTC (rev 3275)
@@ -193,7 +193,7 @@
   ALTER TABLE <dtml-var schema>mm_account
       RENAME COLUMN assign_queue TO assign_queue_old <dtml-var sql_delimiter>
   ALTER TABLE <dtml-var schema>mm_account
-      ADD COLUMN assign_queue <dtml-var sql_varchar>(128) <dtml-var sql_delimiter>
+      ADD COLUMN assign_queue <dtml-var sql_varchar>(64) <dtml-var sql_delimiter>
   UPDATE <dtml-var schema>mm_account
       SET assign_queue = assign_queue_old <dtml-var sql_delimiter>
   ALTER TABLE <dtml-var schema>mm_account
@@ -217,6 +217,10 @@
 
   ALTER TABLE <dtml-var schema>mm_queue
       MODIFY COLUMN assign_group <dtml-var sql_varchar>(128) <dtml-var sql_delimiter>
+  ALTER TABLE <dtml-var schema>mm_account
+      MODIFY COLUMN assign_queue <dtml-var sql_varchar>(64)<dtml-var sql_delimiter>
+  ALTER TABLE <dtml-var schema>mm_queue
+      MODIFY COLUMN queue_name <dtml-var sql_varchar>(64)<dtml-var sql_delimiter>
 
 <dtml-else>
 

Modified: MailManager/branches/RELENG_2_2/tests/testQueueing.py
===================================================================
--- MailManager/branches/RELENG_2_2/tests/testQueueing.py	2006-06-29 14:54:31 UTC (rev 3274)
+++ MailManager/branches/RELENG_2_2/tests/testQueueing.py	2006-06-29 14:57:50 UTC (rev 3275)
@@ -156,7 +156,8 @@
                  6 - Prio1 ... English, IT              (Jacques, Mark, John)
         """
         self.mmobj.wipeDataset('queuetests')
-        self.mmobj.sql.setNextTicketId(sqv_id=1)
+        if self.mmobj.dbplatform == 'postgres':
+            self.mmobj.sql.setNextTicketId(sqv_id=1)
         self.mmobj.populateDataset('queuetests')
         self.setCurrentUser('mark', ('Manager', 'Tickets', 'Reports', 'Settings'))
 
@@ -261,6 +262,9 @@
         res = self.mmobj.sql.listQueues(
             sqv_queue_name = 'n' * 62
         )
+        print res
+        for r in res:
+            print r.queue_name
         self.failUnless(len(res) == 1)
         self.mmobj.http_editQueue(queue_name='n'*62, group_name='y'*128, REQUEST=self.request)
         res = self.mmobj.sql.listQueues(


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