Changeset: 7fe081325134 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fe081325134
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/97_comments.sql
Branch: comment-on
Log Message:
Simplify sys.comment_on now that the EXISTS bug has been fixed
diffs (26 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -992,8 +992,7 @@ sql_create_comments_table(Client c)
"BEGIN\n"
" IF obj_remark IS NULL OR obj_remark = '' THEN\n"
" DELETE FROM sys.comments WHERE id = obj_id;\n"
- "-- ELSEIF EXISTS (SELECT id FROM sys.comments WHERE id
= obj_id) THEN\n"
- " ELSEIF 0 < (SELECT COUNT(id) FROM sys.comments WHERE
id = obj_id) THEN\n"
+ " ELSEIF EXISTS (SELECT id FROM sys.comments WHERE id =
obj_id) THEN\n"
" UPDATE sys.comments SET remark = obj_remark
WHERE id = obj_id;\n"
" ELSE\n"
" INSERT INTO sys.comments VALUES (obj_id,
obj_remark);\n"
diff --git a/sql/scripts/97_comments.sql b/sql/scripts/97_comments.sql
--- a/sql/scripts/97_comments.sql
+++ b/sql/scripts/97_comments.sql
@@ -13,8 +13,7 @@ CREATE PROCEDURE sys.comment_on(obj_id I
BEGIN
IF obj_remark IS NULL OR obj_remark = '' THEN
DELETE FROM sys.comments WHERE id = obj_id;
--- ELSEIF EXISTS (SELECT id FROM sys.comments WHERE id = obj_id) THEN
- ELSEIF 0 < (SELECT COUNT(id) FROM sys.comments WHERE id = obj_id) THEN
+ ELSEIF EXISTS (SELECT id FROM sys.comments WHERE id = obj_id) THEN
UPDATE sys.comments SET remark = obj_remark WHERE id = obj_id;
ELSE
INSERT INTO sys.comments VALUES (obj_id, obj_remark);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
