From 065e95723b2dbeef563e35c160a51056ebe9b568 Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Mon, 15 Aug 2016 22:58:42 +0200
Subject: [PATCH] Forward to static aliases before wildcards, related to #38

---
 postfix/conf/sqlite-virtual_alias_maps.cf | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/postfix/conf/sqlite-virtual_alias_maps.cf b/postfix/conf/sqlite-virtual_alias_maps.cf
index 39423261..8047e826 100644
--- a/postfix/conf/sqlite-virtual_alias_maps.cf
+++ b/postfix/conf/sqlite-virtual_alias_maps.cf
@@ -1,11 +1,17 @@
 dbpath = /data/freeposte.db
 query =
- SELECT destination 
-	FROM alias 
-	WHERE alias.email = '%s' 
-	      AND alias.wildcard = 0 
- UNION SELECT destination 
-	FROM alias 
-	WHERE '%s' LIKE alias.email 
-	      AND alias.wildcard = 1 
- LIMIT 1
+ SELECT destination
+	FROM alias
+	WHERE
+    (
+     alias.wildcard = 0
+     AND
+     alias.email = '%s'
+    ) OR (
+     alias.wildcard = 1
+     AND
+     '%s' LIKE alias.email
+    )
+  ORDER BY
+    alias.wildcard ASC
+  LIMIT 1