From 73906b60da91434cfb657deb2f8abff611eef96d Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Wed, 2 Mar 2016 18:19:21 +0100 Subject: [PATCH] Verbosity terse for tests --- test/CDB_CartodbfyTableTest.sql | 2 +- test/CDB_CartodbfyTableTest_expect | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/test/CDB_CartodbfyTableTest.sql b/test/CDB_CartodbfyTableTest.sql index f491aca..2144d0b 100644 --- a/test/CDB_CartodbfyTableTest.sql +++ b/test/CDB_CartodbfyTableTest.sql @@ -1,5 +1,5 @@ SET client_min_messages TO error; -\set VERBOSITY default +\set VERBOSITY terse CREATE OR REPLACE FUNCTION CDB_CartodbfyTableCheck(tabname regclass, label text) RETURNS text AS diff --git a/test/CDB_CartodbfyTableTest_expect b/test/CDB_CartodbfyTableTest_expect index e144354..aeadfa1 100644 --- a/test/CDB_CartodbfyTableTest_expect +++ b/test/CDB_CartodbfyTableTest_expect @@ -2,8 +2,6 @@ SET CREATE FUNCTION SELECT 1 ERROR: Please set user quota before cartodbfying tables. -CONTEXT: SQL statement "SELECT cartodb._CDB_check_prerequisites(destschema, reloid)" -PL/pgSQL function cdb_cartodbfytable(text,regclass) line 21 at PERFORM 0 single non-geometrical column cartodbfied fine DROP TABLE @@ -33,12 +31,6 @@ text cartodb_id cartodbfied fine DROP TABLE SELECT 1 ERROR: CDB(_CDB_Rewrite_Table:22P02:invalid input syntax for integer: "nan"): CREATE TABLE public.t_0 AS SELECT cartodb_id::bigint ,NULL::geometry(Geometry,4326) AS the_geom,NULL::geometry(Geometry,3857) AS the_geom_webmercator FROM t -CONTEXT: SQL statement "SELECT _CDB_SQL(sql, '_CDB_Rewrite_Table')" -PL/pgSQL function _cdb_rewrite_table(regclass,text) line 295 at PERFORM -SQL statement "SELECT _CDB_Rewrite_Table(reloid, destschema)" -PL/pgSQL function cdb_cartodbfytable(text,regclass) line 51 at PERFORM -SQL statement "SELECT CDB_CartodbfyTable('public', tabname)" -PL/pgSQL function cdb_cartodbfytablecheck(regclass,text) line 31 at PERFORM DROP TABLE SELECT 1 empty text cartodb_id cartodbfied fine @@ -95,14 +87,6 @@ DROP TABLE CREATE TABLE INSERT 0 1 ERROR: CDB(_CDB_Has_Usable_Primary_ID: multiple primary keys for table "many_colliding_columns" are not allowed): ALTER TABLE many_colliding_columns ADD CONSTRAINT cartodb_id_pk PRIMARY KEY (cartodb_id) -CONTEXT: SQL statement "SELECT _CDB_Error(sql, Format('_CDB_Has_Usable_Primary_ID: %s', SQLERRM))" -PL/pgSQL function _cdb_has_usable_primary_id(regclass) line 56 at PERFORM -SQL statement "SELECT _CDB_Has_Usable_Primary_ID(reloid)" -PL/pgSQL function _cdb_rewrite_table(regclass,text) line 50 at SQL statement -SQL statement "SELECT _CDB_Rewrite_Table(reloid, destschema)" -PL/pgSQL function cdb_cartodbfytable(text,regclass) line 51 at PERFORM -SQL statement "SELECT CDB_CartodbfyTable('public', tabname)" -PL/pgSQL function cdb_cartodbfytablecheck(regclass,text) line 31 at PERFORM DROP TABLE CREATE TABLE INSERT 0 4