From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 14 Apr 2013 15:12:30 +0000 (-0400)
Subject: Add serial comma
X-Git-Tag: REL9_3_BETA1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e08fdf13107b6685047cf055c7966845c8c96f90;p=postgresql

Add serial comma
---

diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 638fd1a85b..4209b4c6d0 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -1989,7 +1989,7 @@ view_is_auto_updatable(Relation view)
 		return gettext_noop("Views containing HAVING are not automatically updatable.");
 
 	if (viewquery->setOperations != NULL)
-		return gettext_noop("Views containing UNION, INTERSECT or EXCEPT are not automatically updatable.");
+		return gettext_noop("Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable.");
 
 	if (viewquery->cteList != NIL)
 		return gettext_noop("Views containing WITH are not automatically updatable.");
diff --git a/src/test/regress/expected/updatable_views.out b/src/test/regress/expected/updatable_views.out
index 005bb0961e..ecb61e0ff3 100644
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -155,7 +155,7 @@ DETAIL:  Views that return columns that are not columns of their base relation a
 HINT:  To make the view updatable, provide an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE trigger.
 DELETE FROM ro_view6;
 ERROR:  cannot delete from view "ro_view6"
-DETAIL:  Views containing UNION, INTERSECT or EXCEPT are not automatically updatable.
+DETAIL:  Views containing UNION, INTERSECT, or EXCEPT are not automatically updatable.
 HINT:  To make the view updatable, provide an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE trigger.
 UPDATE ro_view7 SET a=a+1;
 ERROR:  cannot update view "ro_view7"