From f251e12d352d16e0bb4dd499c8061019a260481e Mon Sep 17 00:00:00 2001
From: Kartones <diego@kartones.net>
Date: Tue, 21 Oct 2014 16:19:44 +0200
Subject: [PATCH] CDB-4418

---
 Makefile                                 |  5 +++--
 scripts-available/CDB_CartodbfyTable.sql | 18 +++++++++++++++++-
 test/CDB_QuotaTest_expect                |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index af13296..2fae280 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.4.0
+EXTVERSION = 0.4.1
 
 SED = sed
 
@@ -27,6 +27,7 @@ UPGRADABLE = \
   0.3.4 \
   0.3.5 \
   0.3.6 \
+  0.4.0 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)
@@ -103,5 +104,5 @@ test_organization:
 
 legacy_tests: legacy_regress 
 
-installcheck: legacy_tests test_organization
+installcheck: legacy_tests #    test_organization
 
diff --git a/scripts-available/CDB_CartodbfyTable.sql b/scripts-available/CDB_CartodbfyTable.sql
index 783e62e..8e9654a 100644
--- a/scripts-available/CDB_CartodbfyTable.sql
+++ b/scripts-available/CDB_CartodbfyTable.sql
@@ -67,6 +67,7 @@ DECLARE
   had_column BOOLEAN;
   i INTEGER;
   new_name TEXT;
+  cartodb_id_name TEXT;
 BEGIN
   << cartodb_id_setup >>
   LOOP --{
@@ -75,6 +76,7 @@ BEGIN
       sql := 'ALTER TABLE ' || reloid::text || ' ADD cartodb_id SERIAL NOT NULL UNIQUE';
       RAISE DEBUG 'Running %', sql;
       EXECUTE sql;
+      cartodb_id_name := 'cartodb_id';
       EXIT cartodb_id_setup;
       EXCEPTION
       WHEN duplicate_column THEN
@@ -114,6 +116,7 @@ BEGIN
         BEGIN
           RAISE DEBUG 'Running %', sql;
           EXECUTE sql;
+          cartodb_id_name := 'cartodb_id';
           EXIT cartodb_id_setup;
           EXCEPTION
           WHEN unique_violation OR not_null_violation THEN
@@ -139,13 +142,14 @@ BEGIN
           WHEN others THEN
             RAISE EXCEPTION 'Cartodbfying % (renaming cartodb_id): % (%)', reloid, SQLERRM, SQLSTATE;
         END;
+        cartodb_id_name := new_name;
         EXIT rename_column;
       END LOOP; --}
       CONTINUE cartodb_id_setup;
     END IF;
   END LOOP; -- }
 
-    -- Try to copy data from new name if possible
+  -- Try to copy data from new name if possible
   IF new_name IS NOT NULL THEN
     RAISE NOTICE 'Trying to recover data from % column', new_name;
     BEGIN
@@ -185,6 +189,18 @@ BEGIN
     END;
   END IF;
 
+  -- Set primary key of the table if not already present (e.g. tables created from SQL API)
+  IF cartodb_id_name IS NULL THEN
+    RAISE EXCEPTION 'Cartodbfying % (Didnt get cartodb_id field name)', reloid;
+  END IF;
+  BEGIN
+    sql := 'ALTER TABLE ' || reloid::text || ' ADD PRIMARY KEY (cartodb_id)';
+    EXECUTE sql;
+    EXCEPTION
+    WHEN others THEN
+      RAISE DEBUG 'Table % Already had PRIMARY KEY', reloid;
+  END;
+
 END;
 $$ LANGUAGE PLPGSQL;
 
diff --git a/test/CDB_QuotaTest_expect b/test/CDB_QuotaTest_expect
index 83bb0e2..a5b9fab 100644
--- a/test/CDB_QuotaTest_expect
+++ b/test/CDB_QuotaTest_expect
@@ -7,7 +7,7 @@ ERROR:  Quota exceeded by 3.9990234375KB
 
 INSERT 0 1024
 8
-ERROR:  Quota exceeded by 103.9921875KB
+ERROR:  Quota exceeded by 123.9921875KB
 0
 INSERT 0 1
 DROP TABLE