diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index affc544..976b4ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,12 +49,16 @@ also installs migration scripts to go from "V" to "V"next and from "V"next to "V". Example to upgrade a 0.2.0dev version: ```sql -ALTER EXTENSION cartodb UPDATE TO '0.2.0devnext'; +ALTER EXTENSION cartodb UPDATE TO '0.2.0next'; ALTER EXTENSION cartodb UPDATE TO '0.2.0dev'; ``` - Starting with 0.2.0, the in-place reload can be done with an ad-hoc function: ```sql SELECT cartodb.cdb_extension_reload(); ``` + +A useful query: +```sql +SELECT * FROM pg_extension_update_paths('cartodb') WHERE path IS NOT NULL AND source = cdb_version(); +``` diff --git a/scripts-available/CDB_Quota.sql b/scripts-available/CDB_Quota.sql index 3474f48..77f9df5 100644 --- a/scripts-available/CDB_Quota.sql +++ b/scripts-available/CDB_Quota.sql @@ -1,18 +1,15 @@ CREATE OR REPLACE FUNCTION cartodb._CDB_total_relation_size(_schema_name TEXT, _table_name TEXT) RETURNS bigint AS $$ +DECLARE relation_size bigint := 0; BEGIN - IF EXISTS ( - SELECT 1 FROM information_schema.tables - WHERE table_catalog = current_database() - AND table_schema = _schema_name - AND table_name = _table_name - ) - THEN - RETURN pg_total_relation_size(format('"%s"."%s"', _schema_name, _table_name)); - ELSE - RETURN 0; - END IF; + BEGIN + SELECT pg_total_relation_size(format('"%s"."%s"', _schema_name, _table_name)) INTO relation_size; + EXCEPTION + WHEN undefined_table OR OTHERS THEN + RAISE NOTICE 'cartodb._CDB_total_relation_size(''%'', ''%'') caught error: % (%)', _schema_name, _table_name, SQLERRM, SQLSTATE; + END; + RETURN relation_size; END; $$ LANGUAGE 'plpgsql' VOLATILE;