cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CDB-3497 ongoing spec stabilization

Browse Source
This commit is contained in:
Kartones 2014-07-28 15:16:19 +02:00
parent e5c8015e17
commit 6d665ab163
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,7 +1,7 @@
# cartodb/Makefile
EXTENSION = cartodb
EXTVERSION = 0.3.1
EXTVERSION = 0.3.2
SED = sed
@ -20,6 +20,7 @@ UPGRADABLE = \
0.2.0 \
0.2.1 \
0.3.0 \
0.3.0dev \
$(EXTVERSION)dev \
$(EXTVERSION)next \
$(END)

22
scripts-available/CDB_CartodbfyTable.sql
View File

@ -497,12 +497,10 @@ BEGIN
EXIT rename_column;
END LOOP; --}
CONTINUE column_setup;
END LOOP; -- } column_setup
END LOOP; -- } on expected geometry columns
SELECT exists_geom_cols;
RETURN exists_geom_cols;
END;
$$ LANGUAGE PLPGSQL;
@ -517,20 +515,20 @@ DECLARE
exists_geom_cols BOOLEAN[];
BEGIN
PERFORM public._CDB_check_prerequisites(schema_name, reloid);
PERFORM cartodb._CDB_check_prerequisites(schema_name, reloid);
PERFORM public._CDB_drop_triggers(reloid);
PERFORM cartodb._CDB_drop_triggers(reloid);
-- Ensure required fields exist
PERFORM public._CDB_create_cartodb_id_column(reloid);
PERFORM public._CDB_create_timestamp_columns(reloid);
SELECT public._CDB_create_the_geom_columns(reloid) INTO exists_geom_cols;
PERFORM cartodb._CDB_create_cartodb_id_column(reloid);
PERFORM cartodb._CDB_create_timestamp_columns(reloid);
SELECT cartodb._CDB_create_the_geom_columns(reloid) INTO exists_geom_cols;
-- Both only populate if proceeds
PERFORM public._CDB_populate_the_geom_from_the_geom_webmercator(reloid, exists_geom_cols);
PERFORM public._CDB_populate_the_geom_webmercator_from_the_geom(reloid, exists_geom_cols);
PERFORM cartodb._CDB_populate_the_geom_from_the_geom_webmercator(reloid, exists_geom_cols);
PERFORM cartodb._CDB_populate_the_geom_webmercator_from_the_geom(reloid, exists_geom_cols);
PERFORM public._CDB_create_triggers(schema_name, reloid);
PERFORM cartodb._CDB_create_triggers(schema_name, reloid);
END;
$$ LANGUAGE PLPGSQL;
@ -539,6 +537,6 @@ CREATE OR REPLACE FUNCTION CDB_CartodbfyTable(reloid REGCLASS)
RETURNS void
AS $$
BEGIN
PERFORM public.CDB_CartodbfyTable('public', reloid);
PERFORM cartodb.CDB_CartodbfyTable('public', reloid);
END;
$$ LANGUAGE PLPGSQL;