From 47d842927759a65afb5bee255307422758db1ec4 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Fri, 14 Aug 2015 17:41:55 +0200 Subject: [PATCH] Use return value from cartodbfy --- scripts-available/CDB_DDLTriggers.sql | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts-available/CDB_DDLTriggers.sql b/scripts-available/CDB_DDLTriggers.sql index becec3d..dddd60e 100644 --- a/scripts-available/CDB_DDLTriggers.sql +++ b/scripts-available/CDB_DDLTriggers.sql @@ -31,14 +31,12 @@ BEGIN PERFORM cartodb.cdb_disable_ddl_hooks(); -- CDB_CartodbfyTable must not create tables, or infinite loop will happen - PERFORM cartodb.CDB_CartodbfyTable(rel.nspname, event_info.relation); + newtable := cartodb.CDB_CartodbfyTable(rel.nspname, event_info.relation); PERFORM cartodb.cdb_enable_ddl_hooks(); RAISE DEBUG 'Inserting into cartodb.CDB_TableMetadata'; - newtable := Format('%s.%s', rel.nspname, rel.relname)::regclass; - -- Add entry to CDB_TableMetadata (should CartodbfyTable do this?) INSERT INTO cartodb.CDB_TableMetadata(tabname, updated_at) VALUES (newtable, now()); @@ -99,12 +97,10 @@ BEGIN PERFORM cartodb.cdb_disable_ddl_hooks(); - PERFORM cartodb.CDB_CartodbfyTable(rel.nspname, event_info.relation); + newtable := cartodb.CDB_CartodbfyTable(rel.nspname, event_info.relation); PERFORM cartodb.cdb_enable_ddl_hooks(); - newtable := Format('%s.%s', rel.nspname, rel.relname)::regclass; - -- update CDB_TableMetadata.updated_at (should invalidate varnish) UPDATE cartodb.CDB_TableMetadata SET updated_at = NOW(), tabname = newtable WHERE tabname = event_info.relation; @@ -145,12 +141,10 @@ BEGIN PERFORM cartodb.cdb_disable_ddl_hooks(); - PERFORM cartodb.CDB_CartodbfyTable(rel.nspname, event_info.relation); + newtable := cartodb.CDB_CartodbfyTable(rel.nspname, event_info.relation); PERFORM cartodb.cdb_enable_ddl_hooks(); - newtable := Format('%s.%s', rel.nspname, rel.relname)::regclass; - -- update CDB_TableMetadata.updated_at (should invalidate varnish) UPDATE cartodb.CDB_TableMetadata SET updated_at = NOW(), tabname = newtable WHERE tabname = event_info.relation;