From 93ecad501ae75b013bad1e1983e4a2caa087dc5f Mon Sep 17 00:00:00 2001
From: Gal Matijevic <gmatijevic@aip.de>
Date: Tue, 12 Sep 2017 15:56:30 +0200
Subject: [PATCH] release 0.2.2

---
 setup.py              |  2 +-
 utils/adql_queries.py | 16 +++++++++++++++-
 utils/run.py          | 11 ++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 16a4308..826e34d 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 python_version = sys.version_info.major
 
-version = '0.2.1'
+version = '0.2.2'
 
 author = 'Gal Matijevic'
 email = 'gmatijevic@aip.de'
diff --git a/utils/adql_queries.py b/utils/adql_queries.py
index 9fb4ff2..a2f14e7 100644
--- a/utils/adql_queries.py
+++ b/utils/adql_queries.py
@@ -223,6 +223,20 @@
 ) AS sub;
 """,
 """
-            SELECT POINT('icrs', ra, dec) as "p", z AS y FROM "db".tab
+SELECT
+                ATLASsource.*,
+                2*DEGREES(ASIN(sqrt(power(-0.997825033922517-cx, 2) + power(-0.052293794140904105-cy, 2) + power(-0.040131792532559725-cz,2)) / 2)) * 60 as dist
+            FROM
+                ATLASsource
+            WHERE
+                dec > -2.3166666666666664
+            AND
+                dec < -2.283333333333333
+            AND
+                RA >= 182.98331970017435
+            AND
+                RA <= 183.01668029982565
+            AND
+                ((cx * -0.997825033922517 + cy * -0.052293794140904105 + cz * -0.040131792532559725 ) >= 0.9999999576920253)
 """
 ]
diff --git a/utils/run.py b/utils/run.py
index d7ae1bd..6c2a3ca 100644
--- a/utils/run.py
+++ b/utils/run.py
@@ -174,8 +174,9 @@ def test_translated_mysql_parsing(qs):
         qp.set_query(translated_query)
         try:
             qp.process_query()
-        except QueryError:
-            raise
+            syntax_errors = []
+        except QuerySyntaxError as e:
+            syntax_errors = e.syntax_errors
         s = time.time() - s
         #  cols, keys, funcs = qp.columns, qp.keywords, qp.functions
         #  s = 0.0
@@ -183,15 +184,15 @@ def test_translated_mysql_parsing(qs):
                             #  qp.syntax_errors)
         cols, keys, funcs, dispcols= qp.columns, qp.keywords, qp.functions, \
             qp.display_columns
-        pretty_print(q, cols, keys, funcs, dispcols, s, qp.syntax_errors,
+        pretty_print(q, cols, keys, funcs, dispcols, s, syntax_errors,
                      show_diff=True)
 
 
 if __name__ == '__main__':
-    test_mysql_parsing(test_queries.queries[-1:])
+    #  test_mysql_parsing(test_queries.queries[-1:])
     #  test_mysql_parsing(test_queries.queries[35:42])
     #  test_mysql_parsing(test_queries.queries[6:7])
     #  test_mysql_parsing(test_queries.queries[:])
     #  test_mysql_parsing(broken_queries.queries[-1:])
     #  test_adql_translation(adql_queries.queries[-1:])
-    #  test_translated_mysql_parsing(mysql_adql_queries.queries)
+    test_translated_mysql_parsing(mysql_adql_queries.queries[-1:])