From: Sandro Santilli <strk@keybit.net>
Date: Mon, 29 Sep 2014 07:28:52 +0000 (+0000)
Subject: Fix syntax error in RAISE calls (#2942)
X-Git-Tag: 2.2.0rc1~830
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce004f84a9b733bd07bf88352d2c26f7998ee854;p=postgis

Fix syntax error in RAISE calls (#2942)

PostgreSQL 9.5 doesn't tolerate them...

git-svn-id: http://svn.osgeo.org/postgis/trunk@13005 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/topology/sql/predicates.sql.in b/topology/sql/predicates.sql.in
index 985fae6e5..2bf4726de 100644
--- a/topology/sql/predicates.sql.in
+++ b/topology/sql/predicates.sql.in
@@ -226,7 +226,7 @@ BEGIN
       RAISE EXCEPTION 'Intersection point/collection not implemented yet';
 
     ELSE
-      RAISE EXCEPTION 'Invalid TopoGeometry type', tg2.type;
+      RAISE EXCEPTION 'Invalid TopoGeometry type %', tg2.type;
     END IF;
 
   ELSIF tg1.type = 2 THEN -- [multi]line
@@ -343,10 +343,10 @@ BEGIN
   ---------------------------------------------------------
 
     ELSIF tg2.type = 4 THEN -- line/collection
-      RAISE EXCEPTION 'Intersection line/collection not implemented yet', tg1.type, tg2.type;
+      RAISE EXCEPTION 'Intersection line/collection not implemented yet';
 
     ELSE
-      RAISE EXCEPTION 'Invalid TopoGeometry type', tg2.type;
+      RAISE EXCEPTION 'Invalid TopoGeometry type %', tg2.type;
     END IF;
 
 
@@ -430,17 +430,17 @@ BEGIN
   ---------------------------------------------------------
 
     ELSIF tg2.type = 4 THEN -- polygon/collection
-      RAISE EXCEPTION 'Intersection poly/collection not implemented yet', tg1.type, tg2.type;
+      RAISE EXCEPTION 'Intersection poly/collection not implemented yet';
 
     ELSE
-      RAISE EXCEPTION 'Invalid TopoGeometry type', tg2.type;
+      RAISE EXCEPTION 'Invalid TopoGeometry type %', tg2.type;
     END IF;
 
   ELSIF tg1.type = 4 THEN -- collection
     IF tg2.type = 4 THEN -- collection/collection
-      RAISE EXCEPTION 'Intersection collection/collection not implemented yet', tg1.type, tg2.type;
+      RAISE EXCEPTION 'Intersection collection/collection not implemented yet';
     ELSE
-      RAISE EXCEPTION 'Invalid TopoGeometry type', tg2.type;
+      RAISE EXCEPTION 'Invalid TopoGeometry type %', tg2.type;
     END IF;
 
   ELSE