From 47b2bdce128399767857ba5ca0d2f15b5303632b Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 4 Jan 2012 21:38:03 +0000 Subject: [PATCH] Work around a PostgreSQL 8.4+ bug with CREATE INTO (#1431) git-svn-id: http://svn.osgeo.org/postgis/trunk@8673 b70326c6-7e19-0410-871a-916f4a2858ee --- topology/test/regress/st_remedgemodface.sql | 12 +++++++++--- topology/test/regress/st_remedgenewface.sql | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/topology/test/regress/st_remedgemodface.sql b/topology/test/regress/st_remedgemodface.sql index d496d91f1..f7517289b 100644 --- a/topology/test/regress/st_remedgemodface.sql +++ b/topology/test/regress/st_remedgemodface.sql @@ -12,12 +12,14 @@ INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( ' CREATE OR REPLACE FUNCTION save_nodes() RETURNS VOID AS $$ +BEGIN DROP TABLE IF EXISTS city_data.orig_node_summary; CREATE TABLE city_data.orig_node_summary AS SELECT node_id, containing_face FROM city_data.node; -$$ LANGUAGE 'SQL'; +END; +$$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION check_nodes(lbl text) RETURNS TABLE (l text, o text, node_id int, @@ -54,12 +56,14 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION save_edges() RETURNS VOID AS $$ +BEGIN DROP TABLE IF EXISTS city_data.orig_edge_summary; CREATE TABLE city_data.orig_edge_summary AS SELECT edge_id, next_left_edge, next_right_edge, left_face, right_face FROM city_data.edge_data; -$$ LANGUAGE 'SQL'; +END; +$$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION check_edges(lbl text) RETURNS TABLE (l text, o text, edge_id int, @@ -99,11 +103,13 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION save_faces() RETURNS VOID AS $$ +BEGIN DROP TABLE IF EXISTS city_data.orig_face_summary; CREATE TABLE city_data.orig_face_summary AS SELECT face_id, mbr FROM city_data.face; -$$ LANGUAGE 'SQL'; +END; +$$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION check_faces(lbl text) RETURNS TABLE (l text, o text, face_id int, mbr text) diff --git a/topology/test/regress/st_remedgenewface.sql b/topology/test/regress/st_remedgenewface.sql index e176736ca..ea44c3cf9 100644 --- a/topology/test/regress/st_remedgenewface.sql +++ b/topology/test/regress/st_remedgenewface.sql @@ -12,12 +12,14 @@ INSERT INTO spatial_ref_sys ( auth_name, auth_srid, srid, proj4text ) VALUES ( ' CREATE OR REPLACE FUNCTION save_nodes() RETURNS VOID AS $$ +BEGIN DROP TABLE IF EXISTS city_data.orig_node_summary; CREATE TABLE city_data.orig_node_summary AS SELECT node_id, containing_face FROM city_data.node; -$$ LANGUAGE 'SQL'; +END; +$$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION check_nodes(lbl text) RETURNS TABLE (l text, o text, node_id int, @@ -54,12 +56,14 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION save_edges() RETURNS VOID AS $$ +BEGIN DROP TABLE IF EXISTS city_data.orig_edge_summary; CREATE TABLE city_data.orig_edge_summary AS SELECT edge_id, next_left_edge, next_right_edge, left_face, right_face FROM city_data.edge_data; -$$ LANGUAGE 'SQL'; +END; +$$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION check_edges(lbl text) RETURNS TABLE (l text, o text, edge_id int, @@ -99,11 +103,13 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION save_faces() RETURNS VOID AS $$ +BEGIN DROP TABLE IF EXISTS city_data.orig_face_summary; CREATE TABLE city_data.orig_face_summary AS SELECT face_id, mbr FROM city_data.face; -$$ LANGUAGE 'SQL'; +END; +$$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION check_faces(lbl text) RETURNS TABLE (l text, o text, face_id int, mbr text) -- 2.40.0