From 1198454046d569c4d12d3d187cc543a41df677c8 Mon Sep 17 00:00:00 2001
From: Carla Iriberri <iriberrig@gmail.com>
Date: Tue, 1 Mar 2016 17:43:21 +0100
Subject: [PATCH] Better exception handling

---
 scripts-available/CDB_CartodbfyTable.sql | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts-available/CDB_CartodbfyTable.sql b/scripts-available/CDB_CartodbfyTable.sql
index e9ddb7b..3da1cf5 100644
--- a/scripts-available/CDB_CartodbfyTable.sql
+++ b/scripts-available/CDB_CartodbfyTable.sql
@@ -521,11 +521,14 @@ BEGIN
 
           BEGIN
             sql := Format('ALTER TABLE %s ALTER cartodb_id TYPE int USING %I::integer', reloid::text, rec.attname);
-            RAISE DEBUG 'Running %', sql;
+            RAISE DEBUG 'CDB(_CDB_Has_Usable_Primary_ID): Running %', sql;
             EXECUTE sql;
             EXCEPTION
+            WHEN invalid_text_representation THEN
+              RAISE DEBUG 'CDB(_CDB_Has_Usable_Primary_ID): Column % of type text is not a valid integer column', rec.attname;
+              useable_key := false;
             WHEN others THEN
-              RAISE DEBUG 'Column % of type text is not a valid integer column', rec.attname;
+              RAISE DEBUG 'CDB(_CDB_Has_Usable_Primary_ID): Exception %', SQLSTATE;
               useable_key := false;
           END;