From 900531f0c14ac5e6dcbb237bd374ddf06d52d01f Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Fri, 14 Aug 2015 13:45:57 +0200 Subject: [PATCH] Disable a couple of tests Comment out tests that check cartodb_id text columns. These are no longer taken into consideration as candidate primary ID (candidate columns should be numeric). --- test/CDB_CartodbfyTableTest.sql | 22 ++++++++++++---------- test/CDB_CartodbfyTableTest_expect | 8 -------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/test/CDB_CartodbfyTableTest.sql b/test/CDB_CartodbfyTableTest.sql index e45cbb6..3204446 100644 --- a/test/CDB_CartodbfyTableTest.sql +++ b/test/CDB_CartodbfyTableTest.sql @@ -164,17 +164,19 @@ SELECT CDB_CartodbfyTableCheck('t', 'trigger-protected the_geom'); SELECT 'extent',ST_Extent(ST_SnapToGrid(the_geom,0.2)) FROM t; DROP TABLE t; --- table with existing cartodb_id field of type text -CREATE TABLE t AS SELECT 10::text as cartodb_id; -SELECT CDB_CartodbfyTableCheck('t', 'text cartodb_id'); -select cartodb_id/2 FROM t; -DROP TABLE t; +-- INFO: disabled because cartodbfy does not longer consider text columns for primary ID +-- -- table with existing cartodb_id field of type text +-- CREATE TABLE t AS SELECT 10::text as cartodb_id; +-- SELECT CDB_CartodbfyTableCheck('t', 'text cartodb_id'); +-- select cartodb_id/2 FROM t; +-- DROP TABLE t; --- table with existing cartodb_id field of type text not casting -CREATE TABLE t AS SELECT 'nan' as cartodb_id; -SELECT CDB_CartodbfyTableCheck('t', 'uncasting text cartodb_id'); -select cartodb_id,_cartodb_id0 FROM t; -DROP TABLE t; +-- INFO: disabled because cartodbfy does not longer consider text columns for primary ID +-- -- table with existing cartodb_id field of type text not casting +-- CREATE TABLE t AS SELECT 'nan' as cartodb_id; +-- SELECT CDB_CartodbfyTableCheck('t', 'uncasting text cartodb_id'); +-- select cartodb_id,_cartodb_id0 FROM t; +-- DROP TABLE t; -- table with existing cartodb_id field of type int4 not sequenced CREATE TABLE t AS SELECT 1::int4 as cartodb_id; diff --git a/test/CDB_CartodbfyTableTest_expect b/test/CDB_CartodbfyTableTest_expect index f413f97..2839fde 100644 --- a/test/CDB_CartodbfyTableTest_expect +++ b/test/CDB_CartodbfyTableTest_expect @@ -28,14 +28,6 @@ trigger-protected the_geom cartodbfied fine extent|BOX(1 1,2 2) DROP TABLE SELECT 1 -text cartodb_id cartodbfied fine -5 -DROP TABLE -SELECT 1 -uncasting text cartodb_id cartodbfied fine -1|nan -DROP TABLE -SELECT 1 unsequenced cartodb_id cartodbfied fine 1 DROP TABLE