From 89cb7733046b39340822d092853f29667ef64357 Mon Sep 17 00:00:00 2001
From: Gaspard Bucher <gaspard@teti.ch>
Date: Thu, 12 Dec 2013 17:08:15 +0100
Subject: [PATCH] Upgrading to querybuilder 1.2.4. Fixes #68 (errors with 'or'
 clause) by using unions.

---
 History.txt     | 1 +
 config/gems.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/History.txt b/History.txt
index 194afb4e..8d10cae9 100644
--- a/History.txt
+++ b/History.txt
@@ -13,6 +13,7 @@
     through 'auth_user'.
   * Created 'manager' user status: can edit users (only through 'auth'). <== TODO: Document
   * Created 'currency' brick to fetch openexchangerates.org exchange rates. <== TODO: Document
+  * Using latest querybuilder to support 'union' (fixes 'or clause' errors).
     
 * Minor changes
   * Fixed gemspec to not include TextMate helper and selenium plugin.
diff --git a/config/gems.yml b/config/gems.yml
index db771508..a7baaa67 100644
--- a/config/gems.yml
+++ b/config/gems.yml
@@ -18,7 +18,7 @@ gem_plugin:     # upload progress
 simple_xlsx_writer:    # spreadsheet
   lib:          'simple_xlsx'
 
-querybuilder:   '= 1.2.3'
+querybuilder:   '= 1.2.4'
 yamltest:       '= 0.7.0'
 safe_yaml:      '= 0.8.0'
 rubyless:       '= 0.8.11'