From 9731ce38ec5dc4d4a0efb8ed624781e9b6909785 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Fri, 14 Oct 2016 10:58:16 +0200 Subject: [PATCH] Exclude configuration tables from the quota cdb_tablemetadata was already being excluded, but not cdb_conf and cdb_analysis_catalog --- scripts-available/CDB_OverviewsSupport.sql | 2 +- scripts-available/CDB_UserTables.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts-available/CDB_OverviewsSupport.sql b/scripts-available/CDB_OverviewsSupport.sql index 78bcb84..a16652b 100644 --- a/scripts-available/CDB_OverviewsSupport.sql +++ b/scripts-available/CDB_OverviewsSupport.sql @@ -41,7 +41,7 @@ AS $$ FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind = 'r' - AND c.relname NOT IN ('cdb_tablemetadata', 'spatial_ref_sys') + AND c.relname NOT IN ('cdb_tablemetadata', 'cdb_analysis_catalog', 'cdb_conf', 'spatial_ref_sys') AND CASE WHEN schema_name IS NULL THEN n.nspname NOT IN ('pg_catalog', 'information_schema', 'topology', 'cartodb') ELSE n.nspname = schema_name diff --git a/scripts-available/CDB_UserTables.sql b/scripts-available/CDB_UserTables.sql index a14c900..777016e 100644 --- a/scripts-available/CDB_UserTables.sql +++ b/scripts-available/CDB_UserTables.sql @@ -14,7 +14,7 @@ SELECT c.relname FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace WHERE c.relkind = 'r' -AND c.relname NOT IN ('cdb_tablemetadata', 'spatial_ref_sys') +AND c.relname NOT IN ('cdb_tablemetadata', 'cdb_analysis_catalog', 'cdb_conf', 'spatial_ref_sys') AND n.nspname NOT IN ('pg_catalog', 'information_schema', 'topology', 'cartodb') AND CASE WHEN perm = 'public' THEN has_table_privilege('publicuser', c.oid, 'SELECT') WHEN perm = 'private' THEN has_table_privilege(current_user, c.oid, 'SELECT') AND NOT has_table_privilege('publicuser', c.oid, 'SELECT')