diff --git a/NEWS.md b/NEWS.md index d7211e6..2c698ca 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,10 @@ -0.7.1 (2015-mm-dd) +0.7.2 (2015-mm-dd) ------------------ +0.7.1 (2015-02-27) +------------------ +* Revert quota checks to `pg_total_relation_size` + 0.7.0 (2015-02-19) ------------------ * Adds CDB_ZoomFromScale function diff --git a/scripts-available/CDB_Quota.sql b/scripts-available/CDB_Quota.sql index 6e7b6bb..9d53d2a 100644 --- a/scripts-available/CDB_Quota.sql +++ b/scripts-available/CDB_Quota.sql @@ -24,7 +24,7 @@ BEGIN FROM user_tables ), sizes AS ( - SELECT COALESCE(INT8(SUM(pg_relation_size('"' || schema_name || '"."' || table_name || '"')))) table_size, + SELECT COALESCE(INT8(SUM(pg_total_relation_size('"' || schema_name || '"."' || table_name || '"')))) table_size, CASE WHEN is_overview THEN 0 WHEN is_raster THEN 1 diff --git a/test/CDB_QuotaTest_expect b/test/CDB_QuotaTest_expect index 1272429..ba04208 100644 --- a/test/CDB_QuotaTest_expect +++ b/test/CDB_QuotaTest_expect @@ -9,7 +9,7 @@ INSERT 0 2048 INSERT 0 2048 INSERT 0 2048 2 -ERROR: Quota exceeded by 159.998046875KB +ERROR: Quota exceeded by 567.998046875KB 0 INSERT 0 1 DROP TABLE diff --git a/test/extension/test.sh b/test/extension/test.sh index 171d323..e4f27f6 100755 --- a/test/extension/test.sh +++ b/test/extension/test.sh @@ -270,13 +270,13 @@ function test_quota_for_each_user() { create_raster_table cdb_testmember_1 raster_1 create_raster_table cdb_testmember_2 raster_2 - sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 4096 - sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 4096 + sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 20480 + sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 20480 create_raster_table cdb_testmember_1 raster_3 - sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 4096 - sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 4096 + sql cdb_testmember_1 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_1'::TEXT);" should 36864 + sql cdb_testmember_2 "SELECT cartodb.CDB_UserDataSize('cdb_testmember_2'::TEXT);" should 20480 drop_raster_table cdb_testmember_1 raster_1 drop_raster_table cdb_testmember_2 raster_2