From ce981bf5ddce4bcaff763f05e1b8ef8012c4c7c9 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Sat, 1 Aug 2015 11:43:13 -0700
Subject: [PATCH] sql: AVG returns float (closes #26)

---
 lib/sql_lexer.mll |  3 ++-
 test/misc.sql     |  7 ++++---
 test/out/misc.xml | 12 +++++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/sql_lexer.mll b/lib/sql_lexer.mll
index cad94c2..79edb99 100644
--- a/lib/sql_lexer.mll
+++ b/lib/sql_lexer.mll
@@ -144,7 +144,8 @@ let keywords =
    "year_month", YEAR_MONTH;
   ] in (* more *)
   let all token l = k := !k @ List.map (fun x -> x,token) l in
-  all (FUNCTION (T.Int,true)) ["max"; "min"; "count";"sum";"avg"];
+  all (FUNCTION (T.Int,true)) ["max"; "min"; "count";"sum"];
+  all (FUNCTION (T.Float,true)) ["avg"];
   all (FUNCTION (T.Int,false)) ["length"; "random";"unix_timestamp"];
   all (FUNCTION (T.Int,false)) ["least"; "greatest"];
   all (FUNCTION (T.Text,false)) ["concat";"lower";"upper";"strftime"];
diff --git a/test/misc.sql b/test/misc.sql
index 45d3224..156bd54 100644
--- a/test/misc.sql
+++ b/test/misc.sql
@@ -1,4 +1,5 @@
 SELECT strftime('%s','now');
-CREATE TABLE issue20 (x INT, `key` VARBINARY(200));
-SELECT * FROM issue20 WHERE x IS NOT NULL;
-CREATE INDEX `key` ON issue20(`key`(20));
+CREATE TABLE test (x INT, `key` VARBINARY(200));
+SELECT * FROM test WHERE x IS NOT NULL;
+CREATE INDEX `key` ON test(`key`(20));
+SELECT avg(x) FROM test;
diff --git a/test/out/misc.xml b/test/out/misc.xml
index 6b47386..468eb79 100644
--- a/test/out/misc.xml
+++ b/test/out/misc.xml
@@ -7,19 +7,25 @@
    <value name="_0" type="Text"/>
   </out>
  </stmt>
- <stmt name="create_issue20" sql="CREATE TABLE issue20 (x INT, `key` VARBINARY(200))" kind="create" target="issue20" cardinality="0">
+ <stmt name="create_test" sql="CREATE TABLE test (x INT, `key` VARBINARY(200))" kind="create" target="test" cardinality="0">
   <in/>
   <out/>
  </stmt>
- <stmt name="select_2" sql="SELECT * FROM issue20 WHERE x IS NOT NULL" kind="select" cardinality="n">
+ <stmt name="select_2" sql="SELECT * FROM test WHERE x IS NOT NULL" kind="select" cardinality="n">
   <in/>
   <out>
    <value name="x" type="Int"/>
    <value name="key" type="Text"/>
   </out>
  </stmt>
- <stmt name="create_index_key" sql="CREATE INDEX `key` ON issue20(`key`(20))" kind="create_index" target="key" cardinality="0">
+ <stmt name="create_index_key" sql="CREATE INDEX `key` ON test(`key`(20))" kind="create_index" target="key" cardinality="0">
   <in/>
   <out/>
  </stmt>
+ <stmt name="select_4" sql="SELECT avg(x) FROM test" kind="select" cardinality="1">
+  <in/>
+  <out>
+   <value name="_0" type="Float"/>
+  </out>
+ </stmt>
 </sqlgg>
-- 
2.11.4.GIT