fix for 9.3 -- pg 9.3 seems to throw errors sooner so we need to check a topology...

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

diff --git a/topology/sql/sqlmm.sql.in.c b/topology/sql/sqlmm.sql.in.c
index 4451dc03025c04dabb30aa8a9923f532550c0c25..67a0dced2f449373aaff4f28c62408af29f8cb8d 100644 (file)
--- a/topology/sql/sqlmm.sql.in.c
+++ b/topology/sql/sqlmm.sql.in.c
@@ -1,9 +1,9 @@
 -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -- 
 -- PostGIS - Spatial Types for PostgreSQL
--- http://postgis.refractions.net
+-- http://postgis.net
 --
--- Copyright (C) 2010, 2011, 2012 Sandro Santilli <strk@keybit.net>
+-- Copyright (C) 2010, 2011, 2012, 2013 Sandro Santilli <strk@keybit.net>
 -- Copyright (C) 2005 Refractions Research Inc.
 --
 -- This is free software; you can redistribute and/or modify it under
@@ -1464,6 +1464,13 @@ BEGIN
      'SQL/MM Spatial exception - null argument';
   END IF;
 
+      --
+  -- Atopology must  be registered
+  -- 
+  IF NOT EXISTS(SELECT name FROM topology WHERE topology.name = atopology) THEN
+    RAISE EXCEPTION
+     'SQL/MM Spatial exception - invalid topology name';
+  END IF;
   --
   -- Apoint must be a point
   --

diff --git a/topology/test/regress/st_addisonode_expected b/topology/test/regress/st_addisonode_expected
index 15fcaecf3c1e48275a6e8d087ba5936829d0af9d..0e99d6e987560e952891d4926e92a25fa60465ac 100644 (file)
--- a/topology/test/regress/st_addisonode_expected
+++ b/topology/test/regress/st_addisonode_expected
@@ -9,7 +9,7 @@ ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
-ERROR:  zero-length delimited identifier at or near """" at character 21
+ERROR:  SQL/MM Spatial exception - invalid topology name
 ERROR:  SQL/MM Spatial exception - not within face
 ERROR:  SQL/MM Spatial exception - not within face
 ERROR:  SQL/MM Spatial exception - not within face