From 67f8a8cd69836b2de6bb981ea0815b760b1a9567 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 11 Aug 2015 19:18:01 +0200 Subject: [PATCH] Fix test_ddl_triggers.sql by removing references to created_at & updated_at columns --- expected/test_ddl_triggers.out | 73 ---------------------------------- sql/test_ddl_triggers.sql | 40 ------------------- 2 files changed, 113 deletions(-) diff --git a/expected/test_ddl_triggers.out b/expected/test_ddl_triggers.out index 737468a..9dcf092 100644 --- a/expected/test_ddl_triggers.out +++ b/expected/test_ddl_triggers.out @@ -36,7 +36,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select 1 as i INTO c.t3; NOTICE: trigger "track_updates" for table "c.t3" does not exist, skipping NOTICE: trigger "update_the_geom_webmercator_trigger" for table "c.t3" does not exist, skipping -NOTICE: trigger "update_updated_at_trigger" for table "c.t3" does not exist, skipping NOTICE: trigger "test_quota" for table "c.t3" does not exist, skipping NOTICE: trigger "test_quota_per_row" for table "c.t3" does not exist, skipping NOTICE: event trigger "cdb_on_relation_create" does not exist, skipping @@ -45,17 +44,6 @@ NOTICE: event trigger "cdb_on_alter_column" does not exist, skipping NOTICE: event trigger "cdb_on_drop_column" does not exist, skipping NOTICE: event trigger "cdb_on_add_column" does not exist, skipping NOTICE: cdb_invalidate_varnish(c.t3) called -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i -from c.t3; - cartodb_id | c=u | u<1s | the_geom | the_geom_webmercator | i -------------+-----+------+----------+----------------------+--- - 1 | t | t | | | 1 -(1 row) - RESET SESSION AUTHORIZATION; select tabname::text, @@ -72,7 +60,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select 1 as cartodb_id INTO c.t4; NOTICE: trigger "track_updates" for table "c.t4" does not exist, skipping NOTICE: trigger "update_the_geom_webmercator_trigger" for table "c.t4" does not exist, skipping -NOTICE: trigger "update_updated_at_trigger" for table "c.t4" does not exist, skipping NOTICE: trigger "test_quota" for table "c.t4" does not exist, skipping NOTICE: trigger "test_quota_per_row" for table "c.t4" does not exist, skipping NOTICE: Column cartodb_id already exists @@ -84,16 +71,6 @@ NOTICE: event trigger "cdb_on_alter_column" does not exist, skipping NOTICE: event trigger "cdb_on_drop_column" does not exist, skipping NOTICE: event trigger "cdb_on_add_column" does not exist, skipping NOTICE: cdb_invalidate_varnish(c.t4) called -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator -from c.t4; - cartodb_id | c=u | u<1s | the_geom | the_geom_webmercator -------------+-----+------+----------+---------------------- - 1 | t | t | | -(1 row) - RESET SESSION AUTHORIZATION; select tabname::text, @@ -116,8 +93,6 @@ select pg_sleep(.1); alter table c.t3 rename column the_geom_webmercator to webmerc; NOTICE: Column cartodb_id already exists -NOTICE: Column created_at already exists -NOTICE: Column updated_at already exists NOTICE: Column the_geom already exists NOTICE: event trigger "cdb_on_relation_create" does not exist, skipping NOTICE: event trigger "cdb_on_relation_drop" does not exist, skipping @@ -125,17 +100,6 @@ NOTICE: event trigger "cdb_on_alter_column" does not exist, skipping NOTICE: event trigger "cdb_on_drop_column" does not exist, skipping NOTICE: event trigger "cdb_on_add_column" does not exist, skipping NOTICE: cdb_invalidate_varnish(c.t3) called -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc -from c.t3; - cartodb_id | c=u | u<1s | the_geom | the_geom_webmercator | i | webmerc -------------+-----+------+----------+----------------------+---+--------- - 1 | t | t | | | 1 | -(1 row) - RESET SESSION AUTHORIZATION; select tabname::text, @@ -155,8 +119,6 @@ select pg_sleep(.1); alter table c.t3 rename column the_geom_webmercator to webmerc2; NOTICE: Column cartodb_id already exists -NOTICE: Column created_at already exists -NOTICE: Column updated_at already exists NOTICE: Column the_geom already exists NOTICE: event trigger "cdb_on_relation_create" does not exist, skipping NOTICE: event trigger "cdb_on_relation_drop" does not exist, skipping @@ -164,17 +126,6 @@ NOTICE: event trigger "cdb_on_alter_column" does not exist, skipping NOTICE: event trigger "cdb_on_drop_column" does not exist, skipping NOTICE: event trigger "cdb_on_add_column" does not exist, skipping NOTICE: cdb_invalidate_varnish(c.t3) called -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc, webmerc2 -from c.t3; - cartodb_id | c=u | u<1s | the_geom | the_geom_webmercator | i | webmerc | webmerc2 -------------+-----+------+----------+----------------------+---+---------+---------- - 1 | t | t | | | 1 | | -(1 row) - RESET SESSION AUTHORIZATION; select tabname::text, @@ -197,8 +148,6 @@ select pg_sleep(.1); alter table c.t3 drop column the_geom_webmercator; NOTICE: Column cartodb_id already exists -NOTICE: Column created_at already exists -NOTICE: Column updated_at already exists NOTICE: Column the_geom already exists NOTICE: event trigger "cdb_on_relation_create" does not exist, skipping NOTICE: event trigger "cdb_on_relation_drop" does not exist, skipping @@ -206,17 +155,6 @@ NOTICE: event trigger "cdb_on_alter_column" does not exist, skipping NOTICE: event trigger "cdb_on_drop_column" does not exist, skipping NOTICE: event trigger "cdb_on_add_column" does not exist, skipping NOTICE: cdb_invalidate_varnish(c.t3) called -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc, webmerc2 -from c.t3; - cartodb_id | c=u | u<1s | the_geom | the_geom_webmercator | i | webmerc | webmerc2 -------------+-----+------+----------+----------------------+---+---------+---------- - 1 | t | t | | | 1 | | -(1 row) - RESET SESSION AUTHORIZATION; select tabname::text, @@ -239,17 +177,6 @@ select pg_sleep(.1); alter table c.t3 add column id2 int; NOTICE: cdb_invalidate_varnish(c.t3) called -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc, webmerc2, id2 -from c.t3; - cartodb_id | c=u | u<1s | the_geom | the_geom_webmercator | i | webmerc | webmerc2 | id2 -------------+-----+------+----------+----------------------+---+---------+----------+----- - 1 | t | t | | | 1 | | | -(1 row) - RESET SESSION AUTHORIZATION; select tabname::text, diff --git a/sql/test_ddl_triggers.sql b/sql/test_ddl_triggers.sql index df5c3a4..8d7bbaf 100644 --- a/sql/test_ddl_triggers.sql +++ b/sql/test_ddl_triggers.sql @@ -21,13 +21,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select 1 as i INTO c.t3; -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i -from c.t3; - RESET SESSION AUTHORIZATION; select tabname::text, @@ -38,11 +31,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; -- Table with cartodb_id field, see -- http://github.com/CartoDB/cartodb-postgresql/issues/32 select 1 as cartodb_id INTO c.t4; -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator -from c.t4; RESET SESSION AUTHORIZATION; select @@ -58,13 +46,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select pg_sleep(.1); alter table c.t3 rename column the_geom_webmercator to webmerc; -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc -from c.t3; - RESET SESSION AUTHORIZATION; select tabname::text, @@ -75,13 +56,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select pg_sleep(.1); alter table c.t3 rename column the_geom_webmercator to webmerc2; -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc, webmerc2 -from c.t3; - RESET SESSION AUTHORIZATION; select tabname::text, @@ -95,13 +69,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select pg_sleep(.1); alter table c.t3 drop column the_geom_webmercator; -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc, webmerc2 -from c.t3; - RESET SESSION AUTHORIZATION; select tabname::text, @@ -115,13 +82,6 @@ SET SESSION AUTHORIZATION 'cartodb_postgresql_unpriv_user'; select pg_sleep(.1); alter table c.t3 add column id2 int; -select - cartodb_id, created_at=updated_at as "c=u", - NOW() - updated_at < '1 secs' as "u<1s", - the_geom, the_geom_webmercator, - i, webmerc, webmerc2, id2 -from c.t3; - RESET SESSION AUTHORIZATION; select tabname::text,