Fixed bug in sample topology load (face id sequence value) [RT-SIGTA]

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

diff --git a/topology/test/load_topology.sql.in b/topology/test/load_topology.sql.in
index fdbf94f1f6b1b20437d4a22f0460160860749f51..4a7d315bd2efadaeb50207023cbab761b1fc8400 100644 (file)
--- a/topology/test/load_topology.sql.in
+++ b/topology/test/load_topology.sql.in
@@ -34,16 +34,16 @@ SELECT topology.CreateTopology('city_data', @SRID@) > 0;
 
 INSERT INTO city_data.face(face_id) VALUES(1); -- F1
 INSERT INTO city_data.face(face_id) VALUES(2); -- F2
-INSERT INTO city_data.face(face_id) VALUES(9); -- F9
 INSERT INTO city_data.face(face_id) VALUES(3); -- F3
 INSERT INTO city_data.face(face_id) VALUES(4); -- F4
 INSERT INTO city_data.face(face_id) VALUES(5); -- F5
 INSERT INTO city_data.face(face_id) VALUES(6); -- F6
 INSERT INTO city_data.face(face_id) VALUES(7); -- F7
 INSERT INTO city_data.face(face_id) VALUES(8); -- F8
+INSERT INTO city_data.face(face_id) VALUES(9); -- F9
 
 -- UPDATE Face id sequence
-SELECT setval('city_data.face_face_id_seq', 8);
+SELECT setval('city_data.face_face_id_seq', 9);
 
 -- 2B. Insert data into <topology_name>.NODE table.
 -- N1

diff --git a/topology/test/regress/copytopology_expected b/topology/test/regress/copytopology_expected
index afeccd7ca101c9c256f50a7e0c8cca0e34cf6d64..ca4f5370bb350dae1af5a5650f78e3850f83922e 100644 (file)
--- a/topology/test/regress/copytopology_expected
+++ b/topology/test/regress/copytopology_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT
@@ -21,7 +21,7 @@ layers|3
 3|CITY_data_UP_down|LAYER3|
 node_node_id_seq|22|1|1|9223372036854775807|1|1|0|f|t
 edge_data_edge_id_seq|26|1|1|9223372036854775807|1|1|0|f|t
-face_face_id_seq|8|1|1|9223372036854775807|1|1|0|f|t
+face_face_id_seq|9|1|1|9223372036854775807|1|1|0|f|t
 layer_id_seq|1|1|1|9223372036854775807|1|1|1|f|f
 topogeo_s_1|9|1|1|9223372036854775807|1|1|0|f|t
 topogeo_s_2|8|1|1|9223372036854775807|1|1|0|f|t

diff --git a/topology/test/regress/gml_expected b/topology/test/regress/gml_expected
index e0bb2a11a390334491e34b3f5005a26492ad7067..4d07eaa76f21ec7c12cbc0248f8e7c743a8f3616 100644 (file)
--- a/topology/test/regress/gml_expected
+++ b/topology/test/regress/gml_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT

diff --git a/topology/test/regress/legacy_predicate_expected b/topology/test/regress/legacy_predicate_expected
index bd50170d3df3e688d8d8f835991c35586a817510..72a284df7314742d027cc559173205613235dc01 100644 (file)
--- a/topology/test/regress/legacy_predicate_expected
+++ b/topology/test/regress/legacy_predicate_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT

diff --git a/topology/test/regress/legacy_query_expected b/topology/test/regress/legacy_query_expected
index 5766d65a0c96dd1f41e3815545627cf1194afd68..3b05e9f21b1b53649adff24e8827b269a75559df 100644 (file)
--- a/topology/test/regress/legacy_query_expected
+++ b/topology/test/regress/legacy_query_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT

diff --git a/topology/test/regress/legacy_validate_expected b/topology/test/regress/legacy_validate_expected
index 0fe1684d85d9c3732238d81ad555a223fd7de41a..24c43935013c0d5cc23207dd0a8fd7be761fe3c9 100644 (file)
--- a/topology/test/regress/legacy_validate_expected
+++ b/topology/test/regress/legacy_validate_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT

diff --git a/topology/test/regress/st_addedgenewfaces_expected b/topology/test/regress/st_addedgenewfaces_expected
index 7c044d170b7161333a638eb80f7e401c9595accd..f19330af37b23e0ce84ecdfc4616853d862551bc 100644 (file)
--- a/topology/test/regress/st_addedgenewfaces_expected
+++ b/topology/test/regress/st_addedgenewfaces_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT

diff --git a/topology/test/regress/st_modedgeheal_expected b/topology/test/regress/st_modedgeheal_expected
index 9304caf9bf64974e553a2e1c4281fe59b62898e4..4453388080d40de0deeec34d633eaa4920cd8980 100644 (file)
--- a/topology/test/regress/st_modedgeheal_expected
+++ b/topology/test/regress/st_modedgeheal_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT

diff --git a/topology/test/regress/st_newedgeheal_expected b/topology/test/regress/st_newedgeheal_expected
index 7aa1ab8a7d9cda64fad324230fc910fa2a1ff54e..63829b8ae536789fe26f82d553fa0beac882497c 100644 (file)
--- a/topology/test/regress/st_newedgeheal_expected
+++ b/topology/test/regress/st_newedgeheal_expected
@@ -1,6 +1,6 @@
 BEGIN
 t
-8
+9
 22
 26
 COMMIT