From 2feb36e57fc2ec29738fd60d37e4423410c4e234 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 17 May 2012 16:02:22 +0000
Subject: [PATCH] query cleanups

---
 hledger-lib/Hledger/Data.hs       | 2 --
 hledger-lib/Hledger/Data/Query.hs | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hledger-lib/Hledger/Data.hs b/hledger-lib/Hledger/Data.hs
index fc1a4249d..bfeb50343 100644
--- a/hledger-lib/Hledger/Data.hs
+++ b/hledger-lib/Hledger/Data.hs
@@ -15,7 +15,6 @@ module Hledger.Data (
                module Hledger.Data.Dates,
                module Hledger.Data.Journal,
                module Hledger.Data.Ledger,
-               module Hledger.Data.Query,
                module Hledger.Data.Posting,
                module Hledger.Data.TimeLog,
                module Hledger.Data.Transaction,
@@ -32,7 +31,6 @@ import Hledger.Data.Commodity
 import Hledger.Data.Dates
 import Hledger.Data.Journal
 import Hledger.Data.Ledger
-import Hledger.Data.Query
 import Hledger.Data.Posting
 import Hledger.Data.TimeLog
 import Hledger.Data.Transaction
diff --git a/hledger-lib/Hledger/Data/Query.hs b/hledger-lib/Hledger/Data/Query.hs
index b29937be9..bfefae887 100644
--- a/hledger-lib/Hledger/Data/Query.hs
+++ b/hledger-lib/Hledger/Data/Query.hs
@@ -11,6 +11,7 @@ module Hledger.Data.Query (
   QueryOpt(..),
   -- * parsing
   parseQuery,
+  simplifyQuery,
   -- * accessors
   queryIsNull,
   queryStartDate,
@@ -207,6 +208,10 @@ parseBool s = s `elem` truestrings
 truestrings :: [String]
 truestrings = ["1","t","true"]
 
+simplifyQuery :: Query -> Query
+simplifyQuery (And [q]) = q
+simplifyQuery q = q
+
 -- * accessors
 
 -- | Does this query match everything ?