Merge branch 'master' into 103-Extension_Group_API

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();
+```

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 (
+  BEGIN
-      SELECT 1 FROM information_schema.tables
+    SELECT pg_total_relation_size(format('"%s"."%s"', _schema_name, _table_name)) INTO relation_size;
-      WHERE table_catalog = current_database()
+  EXCEPTION
-        AND table_schema = _schema_name
+    WHEN undefined_table OR OTHERS THEN
-        AND table_name = _table_name
+      RAISE NOTICE 'cartodb._CDB_total_relation_size(''%'', ''%'') caught error: % (%)', _schema_name, _table_name, SQLERRM, SQLSTATE;
-  )
+  END;
-  THEN
+  RETURN relation_size;
-    RETURN pg_total_relation_size(format('"%s"."%s"', _schema_name, _table_name));
-  ELSE
-    RETURN 0;
-  END IF;
 END;
 $$
 LANGUAGE 'plpgsql' VOLATILE;