SF.net SVN: postfixadmin:[1703] trunk

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

Revision: 1703
          http://sourceforge.net/p/postfixadmin/code/1703
Author:   christian_boltz
Date:     2014-10-23 18:26:54 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
AliasHandler:
- finally fix alias deletion when using MariaDB. The workaround is
  to add another field from the subquery to the outer SELECT so that
  MariaDB can't optimize the subquery to "always 1"
  http://sourceforge.net/p/postfixadmin/bugs/325/
  (I'll open a MariaDB bugreport and add the link to the bugtracker)

Modified Paths:
--------------
    trunk/CHANGELOG.TXT
    trunk/model/AliasHandler.php

Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT	2014-10-22 16:30:25 UTC (rev 1702)
+++ trunk/CHANGELOG.TXT	2014-10-23 18:26:54 UTC (rev 1703)
@@ -15,8 +15,8 @@
 - AliasHandler: don't clean goto field when making alias inactive (bug#316)
 - list-virtual: display quota even if $CONF[used_quotas] == NO (bug#307)
 - vacation.pl: fix postgresql queries in vacation.pl (bug#315)
-- fix query in AliasHandler getList() which caused an empty list in MariaDB
-  (bug#313, bug#325)
+- fix query in AliasHandler getList() which caused an empty list and breaks
+  deletion of aliases in MariaDB (bug#313, bug#325)
 - fetchmail.pl: fix ssl extra options (cert check, cert path, fingerprint)
 - fix logging (run setup.php to fix old log entries) (bug#317)
 - fetchmail.php: change error_reporting() to exclude E_NOTICE (bug#322)

Modified: trunk/model/AliasHandler.php
===================================================================
--- trunk/model/AliasHandler.php	2014-10-22 16:30:25 UTC (rev 1702)
+++ trunk/model/AliasHandler.php	2014-10-23 18:26:54 UTC (rev 1703)
@@ -39,7 +39,8 @@
                 /*options*/ '',
                 /*not_in_db*/ 0,
                 /*dont_write_to_db*/ 1,
-                /*select*/ 'coalesce(__is_mailbox,0) as is_mailbox',
+                /*select*/ 'coalesce(__is_mailbox,0) as is_mailbox, __mailbox_username', 
+                           # __mailbox_username is unused, but needed as workaround for a MariaDB bug
                 /*extrafrom*/ 'LEFT JOIN ( ' .
                     ' SELECT 1 as __is_mailbox, username as __mailbox_username ' .
                     ' FROM ' . table_by_key('mailbox') .

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