Add box3d related objects to skip in the _restore scripts (#1359)

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

diff --git a/utils/new_postgis_restore.pl b/utils/new_postgis_restore.pl
index 12ba6ea8bb1ecd62e6cd77d815827468ec6accb9..d22192c0642dc1af3fe51e5cbd3e0092ac300220 100755 (executable)
--- a/utils/new_postgis_restore.pl
+++ b/utils/new_postgis_restore.pl
@@ -138,6 +138,9 @@ AGGREGATE   st_polygonize(geometry)
 AGGREGATE      st_union(geometry)      
 AGGREGATE      st_union_old(geometry)  
 CAST   CAST (boolean AS text)  
+CAST   CAST (box3d_extent AS box3d)    
+CAST   CAST (box3d_extent AS box2d)    
+CAST   CAST (box3d_extent AS geometry) 
 CAST   CAST (bytea AS public.geometry) 
 CAST   CAST (public.box2d AS public.box3d)     
 CAST   CAST (public.box2d AS public.geometry)  
@@ -151,20 +154,6 @@ CAST       CAST (public.geometry AS public.box2d)
 CAST   CAST (public.geometry AS public.box3d)  
 CAST   CAST (public.geometry AS text)  
 CAST   CAST (text AS public.geometry)  
-FUNCTION       _st_asgeojson(integer, geometry, integer, integer)      
-FUNCTION       _st_asgml(integer, geometry, integer)   
-FUNCTION       _st_askml(integer, geometry, integer)   
-FUNCTION       _st_contains(geometry, geometry)        
-FUNCTION       _st_containsproperly(geometry, geometry)        
-FUNCTION       _st_coveredby(geometry, geometry)       
-FUNCTION       _st_covers(geometry, geometry)  
-FUNCTION       _st_crosses(geometry, geometry) 
-FUNCTION       _st_dwithin(geometry, geometry, double precision)       
-FUNCTION       _st_intersects(geometry, geometry)      
-FUNCTION       _st_linecrossingdirection(geometry, geometry)   
-FUNCTION       _st_overlaps(geometry, geometry)        
-FUNCTION       _st_touches(geometry, geometry) 
-FUNCTION       _st_within(geometry, geometry)  
 FUNCTION       addauth(text)   
 FUNCTION       addbbox(geometry)       
 FUNCTION       addgeometrycolumn(character varying, character varying, character varying, character varying, integer, character varying, integer)      
@@ -174,8 +163,8 @@ FUNCTION    addpoint(geometry, geometry)
 FUNCTION       addpoint(geometry, geometry, integer)   
 FUNCTION       affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision)    
 FUNCTION       affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision)        
-FUNCTION       area(geometry)  
 FUNCTION       area2d(geometry)        
+FUNCTION       area(geometry)  
 FUNCTION       asbinary(geometry)      
 FUNCTION       asbinary(geometry, text)        
 FUNCTION       asewkb(geometry)        
@@ -201,12 +190,11 @@ FUNCTION  azimuth(geometry, geometry)
 FUNCTION       bdmpolyfromtext(text, integer)  
 FUNCTION       bdpolyfromtext(text, integer)   
 FUNCTION       boundary(geometry)      
-FUNCTION       box(box3d)      
-FUNCTION       box(geometry)   
 FUNCTION       box2d(box3d)    
-FUNCTION       box2d(geometry) 
+FUNCTION       box2d(box3d_extent)
 FUNCTION       box2d_contain(box2d, box2d)     
 FUNCTION       box2d_contained(box2d, box2d)   
+FUNCTION       box2d(geometry) 
 FUNCTION       box2d_in(cstring)       
 FUNCTION       box2d_intersects(box2d, box2d)  
 FUNCTION       box2d_left(box2d, box2d)        
@@ -217,15 +205,22 @@ FUNCTION  box2d_overright(box2d, box2d)
 FUNCTION       box2d_right(box2d, box2d)       
 FUNCTION       box2d_same(box2d, box2d)        
 FUNCTION       box3d(box2d)    
+FUNCTION       box3d_extent(box3d_extent)
+FUNCTION       box3d_extent_in(cstring)
+FUNCTION       box3d_extent_in(cstring)
+FUNCTION       box3d_extent_out(box3d_extent)
+FUNCTION       box3d_extent_out(box3d_extent)
 FUNCTION       box3d(geometry) 
 FUNCTION       box3d_in(cstring)       
 FUNCTION       box3d_out(box3d)        
 FUNCTION       box3dtobox(box3d)       
+FUNCTION       box(box3d)      
+FUNCTION       box(geometry)   
 FUNCTION       buffer(geometry, double precision)      
 FUNCTION       buffer(geometry, double precision, integer)     
+FUNCTION       buildarea(geometry)     
 FUNCTION       build_histogram2d(histogram2d, text, text)      
 FUNCTION       build_histogram2d(histogram2d, text, text, text)        
-FUNCTION       buildarea(geometry)     
 FUNCTION       bytea(geometry) 
 FUNCTION       cache_bbox()    
 FUNCTION       centroid(geometry)      
@@ -234,10 +229,11 @@ FUNCTION  checkauth(text, text, text)
 FUNCTION       checkauthtrigger()      
 FUNCTION       chip_in(cstring)        
 FUNCTION       chip_out(chip)  
-FUNCTION       collect(geometry, geometry)     
 FUNCTION       collect_garray(geometry[])      
+FUNCTION       collect(geometry, geometry)     
 FUNCTION       collector(geometry, geometry)   
 FUNCTION       combine_bbox(box2d, geometry)   
+FUNCTION       combine_bbox(box3d_extent, geometry)
 FUNCTION       combine_bbox(box3d, geometry)   
 FUNCTION       compression(chip)       
 FUNCTION       contains(geometry, geometry)    
@@ -265,9 +261,9 @@ FUNCTION    enablelongtransactions()
 FUNCTION       endpoint(geometry)      
 FUNCTION       envelope(geometry)      
 FUNCTION       equals(geometry, geometry)      
-FUNCTION       estimate_histogram2d(histogram2d, box2d)        
 FUNCTION       estimated_extent(text, text)    
 FUNCTION       estimated_extent(text, text, text)      
+FUNCTION       estimate_histogram2d(histogram2d, box2d)        
 FUNCTION       expand(box2d, double precision) 
 FUNCTION       expand(box3d, double precision) 
 FUNCTION       expand(geometry, double precision)      
@@ -285,29 +281,33 @@ FUNCTION  force_3dz(geometry)
 FUNCTION       force_4d(geometry)      
 FUNCTION       force_collection(geometry)      
 FUNCTION       forcerhr(geometry)      
+FUNCTION       geography_analyze(internal)
 FUNCTION       geom_accum(geometry[], geometry)        
 FUNCTION       geomcollfromtext(text)  
 FUNCTION       geomcollfromtext(text, integer) 
 FUNCTION       geomcollfromwkb(bytea)  
 FUNCTION       geomcollfromwkb(bytea, integer) 
+FUNCTION       geometry_above(geometry, geometry)      
+FUNCTION       geometry_analyze(internal)      
+FUNCTION       geometry_below(geometry, geometry)      
 FUNCTION       geometry(box2d) 
 FUNCTION       geometry(box3d) 
+FUNCTION       geometry(box3d_extent)
 FUNCTION       geometry(bytea) 
 FUNCTION       geometry(chip)  
-FUNCTION       geometry(text)  
-FUNCTION       geometry_above(geometry, geometry)      
-FUNCTION       geometry_analyze(internal)      
-FUNCTION       geometry_below(geometry, geometry)      
 FUNCTION       geometry_cmp(geometry, geometry)        
-FUNCTION       geometry_contain(geometry, geometry)    
 FUNCTION       geometry_contained(geometry, geometry)  
+FUNCTION       geometry_contain(geometry, geometry)    
 FUNCTION       geometry_eq(geometry, geometry) 
+FUNCTION       geometryfromtext(text)  
+FUNCTION       geometryfromtext(text, integer) 
 FUNCTION       geometry_ge(geometry, geometry) 
 FUNCTION       geometry_gt(geometry, geometry) 
 FUNCTION       geometry_in(cstring)    
-FUNCTION       geometry_le(geometry, geometry) 
 FUNCTION       geometry_left(geometry, geometry)       
+FUNCTION       geometry_le(geometry, geometry) 
 FUNCTION       geometry_lt(geometry, geometry) 
+FUNCTION       geometryn(geometry, integer)    
 FUNCTION       geometry_out(geometry)  
 FUNCTION       geometry_overabove(geometry, geometry)  
 FUNCTION       geometry_overbelow(geometry, geometry)  
@@ -318,9 +318,7 @@ FUNCTION    geometry_recv(internal)
 FUNCTION       geometry_right(geometry, geometry)      
 FUNCTION       geometry_same(geometry, geometry)       
 FUNCTION       geometry_send(geometry) 
-FUNCTION       geometryfromtext(text)  
-FUNCTION       geometryfromtext(text, integer) 
-FUNCTION       geometryn(geometry, integer)    
+FUNCTION       geometry(text)  
 FUNCTION       geometrytype(geometry)  
 FUNCTION       geomfromewkb(bytea)     
 FUNCTION       geomfromewkt(text)      
@@ -330,8 +328,8 @@ FUNCTION    geomfromwkb(bytea)
 FUNCTION       geomfromwkb(bytea, integer)     
 FUNCTION       geomunion(geometry, geometry)   
 FUNCTION       geosnoop(geometry)      
-FUNCTION       get_proj4_from_srid(integer)    
 FUNCTION       getbbox(geometry)       
+FUNCTION       get_proj4_from_srid(integer)    
 FUNCTION       getsrid(geometry)       
 FUNCTION       gettransactionid()      
 FUNCTION       hasbbox(geometry)       
@@ -347,25 +345,25 @@ FUNCTION  isring(geometry)
 FUNCTION       issimple(geometry)      
 FUNCTION       isvalid(geometry)       
 FUNCTION       jtsnoop(geometry)       
-FUNCTION       length(geometry)        
 FUNCTION       length2d(geometry)      
 FUNCTION       length2d_spheroid(geometry, spheroid)   
 FUNCTION       length3d(geometry)      
 FUNCTION       length3d_spheroid(geometry, spheroid)   
+FUNCTION       length(geometry)        
 FUNCTION       length_spheroid(geometry, spheroid)     
-FUNCTION       line_interpolate_point(geometry, double precision)      
-FUNCTION       line_locate_point(geometry, geometry)   
-FUNCTION       line_substring(geometry, double precision, double precision)    
 FUNCTION       linefrommultipoint(geometry)    
 FUNCTION       linefromtext(text)      
 FUNCTION       linefromtext(text, integer)     
 FUNCTION       linefromwkb(bytea)      
 FUNCTION       linefromwkb(bytea, integer)     
+FUNCTION       line_interpolate_point(geometry, double precision)      
+FUNCTION       line_locate_point(geometry, geometry)   
 FUNCTION       linemerge(geometry)     
 FUNCTION       linestringfromtext(text)        
 FUNCTION       linestringfromtext(text, integer)       
 FUNCTION       linestringfromwkb(bytea)        
 FUNCTION       linestringfromwkb(bytea, integer)       
+FUNCTION       line_substring(geometry, double precision, double precision)    
 FUNCTION       locate_along_measure(geometry, double precision)        
 FUNCTION       locate_between_measures(geometry, double precision, double precision)   
 FUNCTION       lockrow(text, text, text)       
@@ -380,11 +378,10 @@ FUNCTION  lwgeom_gist_penalty(internal, internal, internal)
 FUNCTION       lwgeom_gist_picksplit(internal, internal)       
 FUNCTION       lwgeom_gist_same(box2d, box2d, internal)        
 FUNCTION       lwgeom_gist_union(bytea, internal)      
-FUNCTION       m(geometry)     
 FUNCTION       makebox2d(geometry, geometry)   
 FUNCTION       makebox3d(geometry, geometry)   
-FUNCTION       makeline(geometry, geometry)    
 FUNCTION       makeline_garray(geometry[])     
+FUNCTION       makeline(geometry, geometry)    
 FUNCTION       makepoint(double precision, double precision)   
 FUNCTION       makepoint(double precision, double precision, double precision) 
 FUNCTION       makepoint(double precision, double precision, double precision, double precision)       
@@ -393,6 +390,7 @@ FUNCTION    makepolygon(geometry)
 FUNCTION       makepolygon(geometry, geometry[])       
 FUNCTION       max_distance(geometry, geometry)        
 FUNCTION       mem_size(geometry)      
+FUNCTION       m(geometry)     
 FUNCTION       mlinefromtext(text)     
 FUNCTION       mlinefromtext(text, integer)    
 FUNCTION       mlinefromwkb(bytea)     
@@ -427,9 +425,9 @@ FUNCTION    numinteriorring(geometry)
 FUNCTION       numinteriorrings(geometry)      
 FUNCTION       numpoints(geometry)     
 FUNCTION       overlaps(geometry, geometry)    
-FUNCTION       perimeter(geometry)     
 FUNCTION       perimeter2d(geometry)   
 FUNCTION       perimeter3d(geometry)   
+FUNCTION       perimeter(geometry)     
 FUNCTION       pgis_abs_in(cstring)    
 FUNCTION       pgis_abs_out(pgis_abs)  
 FUNCTION       pgis_geometry_accum_finalfn(pgis_abs)   
@@ -438,11 +436,11 @@ FUNCTION  pgis_geometry_collect_finalfn(pgis_abs)
 FUNCTION       pgis_geometry_makeline_finalfn(pgis_abs)        
 FUNCTION       pgis_geometry_polygonize_finalfn(pgis_abs)      
 FUNCTION       pgis_geometry_union_finalfn(pgis_abs)   
-FUNCTION       point_inside_circle(geometry, double precision, double precision, double precision)     
 FUNCTION       pointfromtext(text)     
 FUNCTION       pointfromtext(text, integer)    
 FUNCTION       pointfromwkb(bytea)     
 FUNCTION       pointfromwkb(bytea, integer)    
+FUNCTION       point_inside_circle(geometry, double precision, double precision, double precision)     
 FUNCTION       pointn(geometry, integer)       
 FUNCTION       pointonsurface(geometry)        
 FUNCTION       polyfromtext(text)      
@@ -482,17 +480,17 @@ FUNCTION  rotatez(geometry, double precision)
 FUNCTION       scale(geometry, double precision, double precision)     
 FUNCTION       scale(geometry, double precision, double precision, double precision)   
 FUNCTION       se_envelopesintersect(geometry, geometry)       
+FUNCTION       segmentize(geometry, double precision)  
 FUNCTION       se_is3d(geometry)       
 FUNCTION       se_ismeasured(geometry) 
 FUNCTION       se_locatealong(geometry, double precision)      
 FUNCTION       se_locatebetween(geometry, double precision, double precision)  
 FUNCTION       se_m(geometry)  
-FUNCTION       se_z(geometry)  
-FUNCTION       segmentize(geometry, double precision)  
 FUNCTION       setfactor(chip, real)   
 FUNCTION       setpoint(geometry, integer, geometry)   
 FUNCTION       setsrid(chip, integer)  
 FUNCTION       setsrid(geometry, integer)      
+FUNCTION       se_z(geometry)  
 FUNCTION       shift_longitude(geometry)       
 FUNCTION       simplify(geometry, double precision)    
 FUNCTION       snaptogrid(geometry, double precision)  
@@ -503,13 +501,18 @@ FUNCTION  spheroid_in(cstring)
 FUNCTION       spheroid_out(spheroid)  
 FUNCTION       srid(chip)      
 FUNCTION       srid(geometry)  
+FUNCTION       st_3dlength(geometry)   
+FUNCTION       st_3dlength_spheroid(geometry, spheroid)        
+FUNCTION       ST_3DMakeBox(geometry, geometry)        
+FUNCTION       ST_3DPerimeter(geometry)        
 FUNCTION       st_addbbox(geometry)    
 FUNCTION       st_addpoint(geometry, geometry) 
 FUNCTION       st_addpoint(geometry, geometry, integer)        
 FUNCTION       st_affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision) 
 FUNCTION       st_affine(geometry, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision, double precision)     
-FUNCTION       st_area(geometry)       
 FUNCTION       st_area2d(geometry)     
+FUNCTION       st_area(geometry)       
+FUNCTION       startpoint(geometry)    
 FUNCTION       st_asbinary(geometry)   
 FUNCTION       st_asbinary(geometry, text)     
 FUNCTION       st_asewkb(geometry)     
@@ -520,16 +523,19 @@ FUNCTION  st_asgeojson(geometry, integer)
 FUNCTION       st_asgeojson(geometry, integer, integer)        
 FUNCTION       st_asgeojson(integer, geometry) 
 FUNCTION       st_asgeojson(integer, geometry, integer)        
+FUNCTION       _st_asgeojson(integer, geometry, integer, integer)      
 FUNCTION       st_asgeojson(integer, geometry, integer, integer)       
 FUNCTION       st_asgml(geometry)      
 FUNCTION       st_asgml(geometry, integer)     
 FUNCTION       st_asgml(integer, geometry)     
+FUNCTION       _st_asgml(integer, geometry, integer)   
 FUNCTION       st_asgml(integer, geometry, integer)    
 FUNCTION       st_ashexewkb(geometry)  
 FUNCTION       st_ashexewkb(geometry, text)    
 FUNCTION       st_askml(geometry)      
 FUNCTION       st_askml(geometry, integer)     
 FUNCTION       st_askml(integer, geometry)     
+FUNCTION       _st_askml(integer, geometry, integer)   
 FUNCTION       st_askml(integer, geometry, integer)    
 FUNCTION       st_assvg(geometry)      
 FUNCTION       st_assvg(geometry, integer)     
@@ -539,12 +545,11 @@ FUNCTION  st_azimuth(geometry, geometry)
 FUNCTION       st_bdmpolyfromtext(text, integer)       
 FUNCTION       st_bdpolyfromtext(text, integer)        
 FUNCTION       st_boundary(geometry)   
-FUNCTION       st_box(box3d)   
-FUNCTION       st_box(geometry)        
 FUNCTION       st_box2d(box3d) 
-FUNCTION       st_box2d(geometry)      
+FUNCTION       st_box2d(box3d_extent)
 FUNCTION       st_box2d_contain(box2d, box2d)  
 FUNCTION       st_box2d_contained(box2d, box2d)        
+FUNCTION       st_box2d(geometry)      
 FUNCTION       st_box2d_in(cstring)    
 FUNCTION       st_box2d_intersects(box2d, box2d)       
 FUNCTION       st_box2d_left(box2d, box2d)     
@@ -555,36 +560,43 @@ FUNCTION  st_box2d_overright(box2d, box2d)
 FUNCTION       st_box2d_right(box2d, box2d)    
 FUNCTION       st_box2d_same(box2d, box2d)     
 FUNCTION       st_box3d(box2d) 
+FUNCTION       st_box3d_extent(box3d_extent)
 FUNCTION       st_box3d(geometry)      
 FUNCTION       st_box3d_in(cstring)    
 FUNCTION       st_box3d_out(box3d)     
-FUNCTION       box3d_extent_in(cstring)
-FUNCTION       box3d_extent_out(box3d_extent)
-FUNCTION       geography_analyze(internal)
+FUNCTION       st_box(box3d)   
+FUNCTION       st_box(geometry)        
 FUNCTION       st_buffer(geometry, double precision)   
 FUNCTION       st_buffer(geometry, double precision, integer)  
+FUNCTION       st_buildarea(geometry)  
 FUNCTION       st_build_histogram2d(histogram2d, text, text)   
 FUNCTION       st_build_histogram2d(histogram2d, text, text, text)     
-FUNCTION       st_buildarea(geometry)  
 FUNCTION       st_bytea(geometry)      
 FUNCTION       st_cache_bbox() 
 FUNCTION       st_centroid(geometry)   
 FUNCTION       st_chip_in(cstring)     
 FUNCTION       st_chip_out(chip)       
-FUNCTION       st_collect(geometry, geometry)  
-FUNCTION       st_collect(geometry[])  
 FUNCTION       st_collect_garray(geometry[])   
+FUNCTION       st_collect(geometry[])  
+FUNCTION       st_collect(geometry, geometry)  
 FUNCTION       st_collector(geometry, geometry)        
 FUNCTION       st_combine_bbox(box2d, geometry)        
+FUNCTION       st_combine_bbox(box3d_extent, geometry)
+FUNCTION       st_combine_bbox(box3d, geometry)
 FUNCTION       st_combine_bbox(box3d, geometry)        
 FUNCTION       st_compression(chip)    
+FUNCTION       _st_contains(geometry, geometry)        
 FUNCTION       st_contains(geometry, geometry) 
+FUNCTION       _st_containsproperly(geometry, geometry)        
 FUNCTION       st_containsproperly(geometry, geometry) 
 FUNCTION       st_convexhull(geometry) 
 FUNCTION       st_coorddim(geometry)   
+FUNCTION       _st_coveredby(geometry, geometry)       
 FUNCTION       st_coveredby(geometry, geometry)        
+FUNCTION       _st_covers(geometry, geometry)  
 FUNCTION       st_covers(geometry, geometry)   
 FUNCTION       st_create_histogram2d(box2d, integer)   
+FUNCTION       _st_crosses(geometry, geometry) 
 FUNCTION       st_crosses(geometry, geometry)  
 FUNCTION       st_curvetoline(geometry)        
 FUNCTION       st_curvetoline(geometry, integer)       
@@ -598,13 +610,14 @@ FUNCTION  st_distance_spheroid(geometry, geometry, spheroid)
 FUNCTION       st_dropbbox(geometry)   
 FUNCTION       st_dump(geometry)       
 FUNCTION       st_dumprings(geometry)  
+FUNCTION       _st_dwithin(geometry, geometry, double precision)       
 FUNCTION       st_dwithin(geometry, geometry, double precision)        
 FUNCTION       st_endpoint(geometry)   
 FUNCTION       st_envelope(geometry)   
 FUNCTION       st_equals(geometry, geometry)   
-FUNCTION       st_estimate_histogram2d(histogram2d, box2d)     
 FUNCTION       st_estimated_extent(text, text) 
 FUNCTION       st_estimated_extent(text, text, text)   
+FUNCTION       st_estimate_histogram2d(histogram2d, box2d)     
 FUNCTION       st_expand(box2d, double precision)      
 FUNCTION       st_expand(box3d, double precision)      
 FUNCTION       st_expand(geometry, double precision)   
@@ -625,24 +638,27 @@ FUNCTION  st_geomcollfromtext(text)
 FUNCTION       st_geomcollfromtext(text, integer)      
 FUNCTION       st_geomcollfromwkb(bytea)       
 FUNCTION       st_geomcollfromwkb(bytea, integer)      
+FUNCTION       st_geometry_above(geometry, geometry)   
+FUNCTION       st_geometry_analyze(internal)   
+FUNCTION       st_geometry_below(geometry, geometry)   
 FUNCTION       st_geometry(box2d)      
 FUNCTION       st_geometry(box3d)      
+FUNCTION       st_geometry(box3d_extent)
 FUNCTION       st_geometry(bytea)      
 FUNCTION       st_geometry(chip)       
-FUNCTION       st_geometry(text)       
-FUNCTION       st_geometry_above(geometry, geometry)   
-FUNCTION       st_geometry_analyze(internal)   
-FUNCTION       st_geometry_below(geometry, geometry)   
 FUNCTION       st_geometry_cmp(geometry, geometry)     
-FUNCTION       st_geometry_contain(geometry, geometry) 
 FUNCTION       st_geometry_contained(geometry, geometry)       
+FUNCTION       st_geometry_contain(geometry, geometry) 
 FUNCTION       st_geometry_eq(geometry, geometry)      
+FUNCTION       st_geometryfromtext(text)       
+FUNCTION       st_geometryfromtext(text, integer)      
 FUNCTION       st_geometry_ge(geometry, geometry)      
 FUNCTION       st_geometry_gt(geometry, geometry)      
 FUNCTION       st_geometry_in(cstring) 
-FUNCTION       st_geometry_le(geometry, geometry)      
 FUNCTION       st_geometry_left(geometry, geometry)    
+FUNCTION       st_geometry_le(geometry, geometry)      
 FUNCTION       st_geometry_lt(geometry, geometry)      
+FUNCTION       st_geometryn(geometry, integer) 
 FUNCTION       st_geometry_out(geometry)       
 FUNCTION       st_geometry_overabove(geometry, geometry)       
 FUNCTION       st_geometry_overbelow(geometry, geometry)       
@@ -653,9 +669,7 @@ FUNCTION    st_geometry_recv(internal)
 FUNCTION       st_geometry_right(geometry, geometry)   
 FUNCTION       st_geometry_same(geometry, geometry)    
 FUNCTION       st_geometry_send(geometry)      
-FUNCTION       st_geometryfromtext(text)       
-FUNCTION       st_geometryfromtext(text, integer)      
-FUNCTION       st_geometryn(geometry, integer) 
+FUNCTION       st_geometry(text)       
 FUNCTION       st_geometrytype(geometry)       
 FUNCTION       st_geomfromewkb(bytea)  
 FUNCTION       st_geomfromewkt(text)   
@@ -670,6 +684,7 @@ FUNCTION    st_histogram2d_in(cstring)
 FUNCTION       st_histogram2d_out(histogram2d) 
 FUNCTION       st_interiorringn(geometry, integer)     
 FUNCTION       st_intersection(geometry, geometry)     
+FUNCTION       _st_intersects(geometry, geometry)      
 FUNCTION       st_intersects(geometry, geometry)       
 FUNCTION       st_isclosed(geometry)   
 FUNCTION       st_isempty(geometry)    
@@ -677,34 +692,31 @@ FUNCTION  st_isring(geometry)
 FUNCTION       st_issimple(geometry)   
 FUNCTION       st_isvalid(geometry)    
 FUNCTION       st_isvalidreason(geometry)      
-FUNCTION       st_length(geometry)     
 FUNCTION       st_length2d(geometry)   
 FUNCTION       st_length2d_spheroid(geometry, spheroid)        
-FUNCTION       st_3dlength(geometry)   
-FUNCTION       st_3dlength_spheroid(geometry, spheroid)        
+FUNCTION       st_length(geometry)     
 FUNCTION       st_length_spheroid(geometry, spheroid)  
-FUNCTION       st_line_interpolate_point(geometry, double precision)   
-FUNCTION       st_line_locate_point(geometry, geometry)        
-FUNCTION       st_line_substring(geometry, double precision, double precision) 
+FUNCTION       _st_linecrossingdirection(geometry, geometry)   
 FUNCTION       st_linecrossingdirection(geometry, geometry)    
 FUNCTION       st_linefrommultipoint(geometry) 
 FUNCTION       st_linefromtext(text)   
 FUNCTION       st_linefromtext(text, integer)  
 FUNCTION       st_linefromwkb(bytea)   
 FUNCTION       st_linefromwkb(bytea, integer)  
+FUNCTION       st_line_interpolate_point(geometry, double precision)   
+FUNCTION       st_line_locate_point(geometry, geometry)        
 FUNCTION       st_linemerge(geometry)  
 FUNCTION       st_linestringfromwkb(bytea)     
 FUNCTION       st_linestringfromwkb(bytea, integer)    
+FUNCTION       st_line_substring(geometry, double precision, double precision) 
 FUNCTION       st_linetocurve(geometry)        
 FUNCTION       st_locate_along_measure(geometry, double precision)     
-FUNCTION       st_locate_between_measures(geometry, double precision, double precision)        
 FUNCTION       st_locatebetweenelevations(geometry, double precision, double precision)        
-FUNCTION       st_m(geometry)  
+FUNCTION       st_locate_between_measures(geometry, double precision, double precision)        
 FUNCTION       st_makebox2d(geometry, geometry)        
-FUNCTION       ST_3DMakeBox(geometry, geometry)        
-FUNCTION       st_makeline(geometry, geometry) 
-FUNCTION       st_makeline(geometry[]) 
 FUNCTION       st_makeline_garray(geometry[])  
+FUNCTION       st_makeline(geometry[]) 
+FUNCTION       st_makeline(geometry, geometry) 
 FUNCTION       st_makepoint(double precision, double precision)        
 FUNCTION       st_makepoint(double precision, double precision, double precision)      
 FUNCTION       st_makepoint(double precision, double precision, double precision, double precision)    
@@ -713,6 +725,7 @@ FUNCTION    st_makepolygon(geometry)
 FUNCTION       st_makepolygon(geometry, geometry[])    
 FUNCTION       st_max_distance(geometry, geometry)     
 FUNCTION       st_mem_size(geometry)   
+FUNCTION       st_m(geometry)  
 FUNCTION       st_minimumboundingcircle(geometry)      
 FUNCTION       st_minimumboundingcircle(geometry, integer)     
 FUNCTION       st_mlinefromtext(text)  
@@ -747,16 +760,16 @@ FUNCTION  st_numinteriorring(geometry)
 FUNCTION       st_numinteriorrings(geometry)   
 FUNCTION       st_numpoints(geometry)  
 FUNCTION       st_orderingequals(geometry, geometry)   
+FUNCTION       _st_overlaps(geometry, geometry)        
 FUNCTION       st_overlaps(geometry, geometry) 
-FUNCTION       st_perimeter(geometry)  
 FUNCTION       st_perimeter2d(geometry)        
-FUNCTION       ST_3DPerimeter(geometry)        
+FUNCTION       st_perimeter(geometry)  
 FUNCTION       st_point(double precision, double precision)    
-FUNCTION       st_point_inside_circle(geometry, double precision, double precision, double precision)  
 FUNCTION       st_pointfromtext(text)  
 FUNCTION       st_pointfromtext(text, integer) 
 FUNCTION       st_pointfromwkb(bytea)  
 FUNCTION       st_pointfromwkb(bytea, integer) 
+FUNCTION       st_point_inside_circle(geometry, double precision, double precision, double precision)  
 FUNCTION       st_pointn(geometry)     
 FUNCTION       st_pointn(geometry, integer)    
 FUNCTION       st_pointonsurface(geometry)     
@@ -764,13 +777,13 @@ FUNCTION  st_polyfromtext(text)
 FUNCTION       st_polyfromtext(text, integer)  
 FUNCTION       st_polyfromwkb(bytea)   
 FUNCTION       st_polyfromwkb(bytea, integer)  
-FUNCTION       st_polygon(geometry, integer)   
 FUNCTION       st_polygonfromtext(text)        
 FUNCTION       st_polygonfromtext(text, integer)       
 FUNCTION       st_polygonfromwkb(bytea)        
 FUNCTION       st_polygonfromwkb(bytea, integer)       
-FUNCTION       st_polygonize(geometry[])       
+FUNCTION       st_polygon(geometry, integer)   
 FUNCTION       st_polygonize_garray(geometry[])        
+FUNCTION       st_polygonize(geometry[])       
 FUNCTION       st_postgis_gist_joinsel(internal, oid, internal, smallint)      
 FUNCTION       st_postgis_gist_sel(internal, oid, internal, integer)   
 FUNCTION       st_relate(geometry, geometry)   
@@ -804,15 +817,17 @@ FUNCTION  st_symdifference(geometry, geometry)
 FUNCTION       st_symmetricdifference(geometry, geometry)      
 FUNCTION       st_text(boolean)        
 FUNCTION       st_text(geometry)       
+FUNCTION       _st_touches(geometry, geometry) 
 FUNCTION       st_touches(geometry, geometry)  
 FUNCTION       st_transform(geometry, integer) 
 FUNCTION       st_translate(geometry, double precision, double precision)      
 FUNCTION       st_translate(geometry, double precision, double precision, double precision)    
 FUNCTION       st_transscale(geometry, double precision, double precision, double precision, double precision) 
-FUNCTION       st_union(geometry, geometry)    
 FUNCTION       st_union(geometry[])    
+FUNCTION       st_union(geometry, geometry)    
 FUNCTION       st_unite_garray(geometry[])     
 FUNCTION       st_width(chip)  
+FUNCTION       _st_within(geometry, geometry)  
 FUNCTION       st_within(geometry, geometry)   
 FUNCTION       st_wkbtosql(bytea)      
 FUNCTION       st_wkttosql(text)       
@@ -826,25 +841,24 @@ FUNCTION  st_z(geometry)
 FUNCTION       st_zmax(box3d)  
 FUNCTION       st_zmflag(geometry)     
 FUNCTION       st_zmin(box3d)  
-FUNCTION       startpoint(geometry)    
 FUNCTION       summary(geometry)       
 FUNCTION       symdifference(geometry, geometry)       
 FUNCTION       symmetricdifference(geometry, geometry) 
 FUNCTION       text(boolean)   
 FUNCTION       text(geometry)  
 FUNCTION       touches(geometry, geometry)     
-FUNCTION       transform(geometry, integer)    
 FUNCTION       transform_geometry(geometry, text, text, integer)       
+FUNCTION       transform(geometry, integer)    
 FUNCTION       translate(geometry, double precision, double precision) 
 FUNCTION       translate(geometry, double precision, double precision, double precision)       
 FUNCTION       transscale(geometry, double precision, double precision, double precision, double precision)    
 FUNCTION       unite_garray(geometry[])        
 FUNCTION       unlockrows(text)        
-FUNCTION       update_geometry_stats() 
-FUNCTION       update_geometry_stats(character varying, character varying)     
 FUNCTION       updategeometrysrid(character varying, character varying, character varying, character varying, integer) 
 FUNCTION       updategeometrysrid(character varying, character varying, character varying, integer)    
 FUNCTION       updategeometrysrid(character varying, character varying, integer)       
+FUNCTION       update_geometry_stats() 
+FUNCTION       update_geometry_stats(character varying, character varying)     
 FUNCTION       width(chip)     
 FUNCTION       within(geometry, geometry)      
 FUNCTION       x(geometry)     
@@ -878,6 +892,7 @@ OPERATORCLASS       btree_geometry_ops
 OPERATORCLASS  gist_geometry_ops       
 TYPE   box2d   
 TYPE   box3d   
+TYPE   box3d_extent    
 TYPE   chip    
 TYPE   geometry        
 TYPE   geometry_dump   

diff --git a/utils/postgis_restore.pl b/utils/postgis_restore.pl
index b70b22e08e6424f887c4250f52f3d3a7e46e49fc..f707db17d0807d90595a4d29b78df034ee776f01 100755 (executable)
--- a/utils/postgis_restore.pl
+++ b/utils/postgis_restore.pl
@@ -61,10 +61,15 @@ my %ops = ();
 $aggs{"accum"} = 1;
 $aggs{"fastunion"} = 1;
 $aggs{"mem_collect"} = 1;
+$aggs{"extent"} = 1;
 
 # This are old postgis functions which might
 # still be in a dump
 my %obsoleted_function = (
+       'box3d_extent_in', 1,
+       'box3d_extent_out', 1,
+       'box3d_extent', 1,
+       'combine_bbox', 1,
        'linefromtext', 1,
        'linestringfromtext', 1,
        'mlinefromtext', 1,
@@ -434,11 +439,13 @@ while( my $line = <INPUT> )
                #print "  ARGS: [".@args."]\n";
 
                my $wkbinvolved = 0;
+               my $box3d_extent_involved = 0;
                for (my $i=0; $i<@args; $i++)
                {
                        my $arg = canonicalize_typename($args[$i]);
                        $args[$i] = $arg;
                        $wkbinvolved++ if ( $arg eq 'wkb' );
+                       $box3d_extent_involved++ if ( $arg eq 'box3d_extent' );
                }
 
                my $args = join(', ', @args);
@@ -453,6 +460,13 @@ while( my $line = <INPUT> )
                        next;
                }
 
+               # BOX3D_EXTENT involved
+               if ( $box3d_extent_involved )
+               {
+                       print "SKIPPING FUNC $id\n" if $DEBUG;
+                       next;
+               }
+
                if ( $funcname eq 'plpgsql_call_handler' )
                {
                        print "SKIPPING FUNC $id\n" if $DEBUG;