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

[<Gin...@us...>]

Revision: 509
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=509&view=rev
Author:   GingerDog
Date:     2009-01-07 19:59:33 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
upgrade.php: this makes it work for me...

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

Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php	2009-01-06 19:51:45 UTC (rev 508)
+++ trunk/upgrade.php	2009-01-07 19:59:33 UTC (rev 509)
@@ -766,7 +766,7 @@
         CONSTRAINT `vacation_notification_pkey` 
         FOREIGN KEY (`on_vacation`) REFERENCES $table_vacation(`email`) ON DELETE CASCADE
     )
-    ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB 
+    ENGINE=InnoDB TYPE=InnoDB 
     COMMENT='Postfix Admin - Virtual Vacation Notifications'
     ");
 
@@ -774,7 +774,7 @@
     $all_sql = split("\n", trim("
         ALTER TABLE `$table_vacation_notification` CHANGE `on_vacation` `on_vacation` VARCHAR( 255 ) NOT NULL
         ALTER TABLE `$table_vacation_notification` CHANGE `notified`    `notified`    VARCHAR( 255 ) NOT NULL
-        ALTER TABLE `$table_vacation_notification` DEFAULT {LATIN1}
+        ALTER TABLE `$table_vacation_notification` DEFAULT CHARACTER SET utf8
     "));
     # Possible errors that can be ignored:
     # None.
@@ -785,10 +785,6 @@
         $result = db_query_parsed($sql);
     }
 
-    # create constraint...
-    $result = db_query_parsed("
-        ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey` 
-        FOREIGN KEY (`on_vacation`) REFERENCES $table_vacation(`email`) ON DELETE CASCADE ");
 }
 
 
@@ -800,7 +796,7 @@
     $table_fetchmail = table_by_key('fetchmail');
 
     db_query_parsed( "
-        create table $table_fetchmail(
+        CREATE TABLE IF NOT EXISTS $table_fetchmail(
          id int(11) unsigned not null auto_increment,
          mailbox varchar(255) not null default '',
          src_server varchar(255) not null default '',


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