From 126643b84e4e7d9ead1eac1deda38c40151bc4a8 Mon Sep 17 00:00:00 2001
From: Andy Eschbacher <andy.eschbacher@gmail.com>
Date: Mon, 16 May 2016 11:15:15 -0400
Subject: [PATCH] casting to text, fixing return catch

---
 src/pg/sql/42_observatory_exploration.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pg/sql/42_observatory_exploration.sql b/src/pg/sql/42_observatory_exploration.sql
index 9dfc866..8b0d34a 100644
--- a/src/pg/sql/42_observatory_exploration.sql
+++ b/src/pg/sql/42_observatory_exploration.sql
@@ -15,7 +15,7 @@ BEGIN
   THEN
     RETURN QUERY
     EXECUTE
-    'SELECT tablename, timespan
+    'SELECT tablename::text, timespan::text
        FROM observatory.obs_table t
        JOIN observatory.obs_column_table ct
          ON ct.table_id = t.id
@@ -24,10 +24,11 @@ BEGIN
        WHERE c.type ILIKE ''geometry''
         AND c.id = $1'
     USING search_term;
+    RETURN;
   ELSE
     RETURN QUERY
     EXECUTE
-    'SELECT tablename, timespan
+    'SELECT tablename::text, timespan::text
        FROM observatory.obs_table t
        JOIN observatory.obs_column_table ct
          ON ct.table_id = t.id
@@ -37,6 +38,7 @@ BEGIN
         AND c.id = $1
         AND t.timespan = $2'
     USING search_term, time_span;
+    RETURN;
   END IF;
 
 END;