Merge pull request #161 from CartoDB/160-add-drop-function-if-exists

Add DROP FUNCTION back to allow migrations #160

Makefile

@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.10.1
+EXTVERSION = 0.10.2
 
 SED = sed
 
@@ -49,6 +49,7 @@ UPGRADABLE = \
   0.9.4 \
   0.10.0 \
   0.10.1 \
+  0.10.2 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)

NEWS.md

@@ -1,6 +1,10 @@
 next (2015-mm-dd)
 -----------------
 
+0.10.2 (2015-09-24)
+-------------------
+* Add back the `DROP FUNCTION IF EXISTS CDB_UserTables(text);` to be able to upgrade from `0.7.3` upward [#160](https://github.com/CartoDB/cartodb-postgresql/issues/160)
+
 0.10.1 (2015-09-16)
 -------------------
 * Get back the `update_updated_at` function (still used by old tables) [#143](https://github.com/CartoDB/cartodb-postgresql/pull/143)

scripts-available/CDB_CartodbfyTable.sql

@@ -688,16 +688,20 @@ BEGIN
 END;
 $$ LANGUAGE 'plpgsql';
 
-
-CREATE TYPE _cdb_has_usable_geom_record
-  AS (has_usable_geoms boolean,
-      text_geom_column boolean,
-      text_geom_column_name text,
-      text_geom_column_srid boolean,
-      has_geom boolean,
-      has_geom_name text,
-      has_mercgeom boolean,
-      has_mercgeom_name text);
+DO $$
+BEGIN
+  IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = '_cdb_has_usable_geom_record') THEN
+    CREATE TYPE _cdb_has_usable_geom_record
+      AS (has_usable_geoms boolean,
+        text_geom_column boolean,
+        text_geom_column_name text,
+        text_geom_column_srid boolean,
+        has_geom boolean,
+        has_geom_name text,
+        has_mercgeom boolean,
+        has_mercgeom_name text);
+    END IF;
+END$$;
 
 DROP FUNCTION IF EXISTS _CDB_Has_Usable_Geom(REGCLASS);
 CREATE OR REPLACE FUNCTION _CDB_Has_Usable_Geom(reloid REGCLASS)

scripts-available/CDB_UserTables.sql

@@ -5,6 +5,7 @@
 --
 -- Currently accepted permissions are: 'public', 'private' or 'all'
 --
+DROP FUNCTION IF EXISTS CDB_UserTables(text);
 CREATE OR REPLACE FUNCTION CDB_UserTables(perm text DEFAULT 'all')
 RETURNS SETOF name
 AS $$