From a8cb99c668487721edf507d2f1111f55abd0ab05 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Sat, 5 Apr 2008 17:37:19 +0000 Subject: [PATCH] proper messages, fq name --- sql/londiste/functions/londiste.node_add_table.sql | 4 ++-- sql/londiste/functions/londiste.node_remove_table.sql | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sql/londiste/functions/londiste.node_add_table.sql b/sql/londiste/functions/londiste.node_add_table.sql index fb047f7f..09865a87 100644 --- a/sql/londiste/functions/londiste.node_add_table.sql +++ b/sql/londiste/functions/londiste.node_add_table.sql @@ -31,7 +31,7 @@ begin perform 1 from londiste.node_table where set_name = i_set_name and table_name = fq_table_name; if found then - select 200, 'OK, already added: ' || fq_table_name into ret_code, ret_desc; + select 200, 'Table already added: ' || fq_table_name into ret_code, ret_desc; return; end if; @@ -55,7 +55,7 @@ begin insert into londiste.node_table (set_name, table_name) values (i_set_name, fq_table_name); - select 200, 'OK' into ret_code, ret_desc; + select 200, 'Table added: ' || fq_table_name into ret_code, ret_desc; return; end; $$ language plpgsql strict; diff --git a/sql/londiste/functions/londiste.node_remove_table.sql b/sql/londiste/functions/londiste.node_remove_table.sql index 13a5c6a4..ae350b06 100644 --- a/sql/londiste/functions/londiste.node_remove_table.sql +++ b/sql/londiste/functions/londiste.node_remove_table.sql @@ -3,18 +3,21 @@ create or replace function londiste.node_remove_table( in i_set_name text, in i_table_name text, out ret_code int4, out ret_desc text) as $$ +declare + fq_table_name text; begin + fq_table_name := londiste.make_fqname(i_table_name); delete from londiste.node_table where set_name = i_set_name - and table_name = i_table_name; + and table_name = fq_table_name; if not found then - select 400, 'Not found: '||i_table_name into ret_code, ret_desc; + select 400, 'Not found: ' || fq_table_name into ret_code, ret_desc; return; end if; -- perform londiste.provider_notify_change(i_queue_name); -- triggers - select 200, 'OK' into ret_code, ret_desc; + select 200, 'Table removed: ' || fq_table_name into ret_code, ret_desc; return; end; $$ language plpgsql strict; -- 2.39.5