--- a/pgsql/update_tables_0.5.x-0.6.pgsql	Thu Apr 12 18:22:54 2012 +0000
+++ b/pgsql/update_tables_0.5.x-0.6.pgsql	Fri Apr 13 14:56:29 2012 +0200
@@ -487,11 +487,12 @@
         record recipient_destination;
         catchall_cursor refcursor;
         recipient varchar(320) := localpart || '@' || the_domain;
+        idestination varchar(320) :=
+            _interpolate_destination(destination, localpart, the_domain);
         did bigint := (SELECT gid FROM domain_name WHERE domainname=the_domain);
     BEGIN
         FOR record IN
-            SELECT recipient,
-                _interpolate_destination(destination, localpart, the_domain)
+            SELECT recipient, idestination
               FROM alias
              WHERE gid = did
                AND address = localpart
@@ -509,8 +510,7 @@
             -- or relocated entry and return the identity mapping if that is
             -- the case
             OPEN catchall_cursor FOR
-                SELECT recipient,
-                    _interpolate_destination(destination, localpart, the_domain)
+                SELECT recipient, idestination
                   FROM catchall
                  WHERE gid = did;
             FETCH NEXT FROM catchall_cursor INTO recordc;