From 5958704509ca8cd37def98822a46ecd741b99068 Mon Sep 17 00:00:00 2001
From: Prasad Muley <pmmuley@gmail.com>
Date: Thu, 15 Jan 2015 15:37:09 +0530
Subject: [PATCH] Fix: Exporting from a SQLFORM.grid with customized search
 queries issues #2006

---
 gluon/sqlhtml.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index 28c37615..df9e8f0f 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -2332,8 +2332,12 @@ class SQLFORM(FORM):
                         #fields but not virtual fields
                         sfields = reduce(lambda a, b: a + b,
                             [[f for f in t if f.readable and not isinstance(f, Field.Virtual)] for t in tables])
-                        dbset = dbset(SQLFORM.build_query(
-                            sfields, keywords))
+                        #use custom_query using searchable
+                        if callable(searchable):
+                            dbset = dbset(searchable(sfields, keywords))
+                        else:
+                            dbset = dbset(SQLFORM.build_query(
+                                sfields, keywords))
                         rows = dbset.select(left=left, orderby=orderby,
                                             cacheable=True, *selectable_columns)
                     except Exception, e: