SF.net SVN: postfixadmin: [319] trunk/upgrade.php

[<chr...@us...>]

Revision: 319
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=319&view=rev
Author:   christian_boltz
Date:     2008-04-06 16:28:40 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
upgrade.php:
- print query (debug mode) _before_ executing it
- upgrade_318_mysql: include CONSTRAINT in CREATE TABLE - otherwise
  dropping it afterwards fails...

Modified Paths:
--------------
    trunk/upgrade.php

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2008-04-06 23:12:29 UTC (rev 318)
+++ trunk/upgrade.php	2008-04-06 23:28:40 UTC (rev 319)
@@ -184,9 +184,11 @@
     $replace['{BOOL_FALSE}'] = db_get_boolean(False);
 
     $query = trim(str_replace(array_keys($replace), $replace, $sql));
+    if (safeget('debug') != "") {
+        print "<p style='color:#999'>$query";
+	}
     $result = db_query($query, $ignore_errors);
     if (safeget('debug') != "") {
-        print "<p style='color:#999'>$query";
         print "<div style='color:#f00'>" . $result['error'] . "</div>";
     }
     return $result;
@@ -543,13 +545,14 @@
 function upgrade_318_mysql() {
     $table_vacation_notification = table_by_key('vacation_notification');
 
-    # create table without constraint for now...
     db_query_parsed( "
         CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
             on_vacation varchar(255) NOT NULL,
             notified varchar(255) NOT NULL,
             notified_at timestamp NOT NULL default now(),
-              PRIMARY KEY on_vacation (`on_vacation`, `notified`)
+              PRIMARY KEY on_vacation (`on_vacation`, `notified`),
+            CONSTRAINT `vacation_notification_pkey` 
+              FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
         )
         ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB 
         COMMENT='Postfix Admin - Virtual Vacation Notifications'


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