[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.3-29-g30c47cfef

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.2 has been updated
       via  30c47cfeff6627e8894be3b9d58ab786042068c6 (commit)
       via  534fab4f4f09e826fa1577e40d517974e28aa20f (commit)
       via  ca58cb5f419ac70789bfc91658224df5c1407b7c (commit)
      from  7f5f964361b89d111060f4dc6620979d783fe09e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 30c47cfeff6627e8894be3b9d58ab786042068c6
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Nov 3 20:49:38 2022 -0400

    News references  #5280

diff --git a/NEWS b/NEWS
index b573e3803..9b6253d7c 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Proj 6.1+, and PostgreSQL 14+.
   - #5241, Crash on ST_SnapToGrid with empty multis (Regina Obe)
   - #5081, Fix error in topology import of self-intersecting rings (Sandro Santilli)
   - #5234, Fix 2.5d topology building regression (Sandro Santilli)
+  - #5280, Handle load of dbase character fields with no width specified (Regina Obe)
 
 
 PostGIS 3.2.3

commit 534fab4f4f09e826fa1577e40d517974e28aa20f
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Nov 3 20:47:09 2022 -0400

    Handle load of dbase character fields with no width specified
    References #5280 for PostGIS 3.2.4

diff --git a/loader/shp2pgsql-core.c b/loader/shp2pgsql-core.c
index f292f212c..036880e5c 100644
--- a/loader/shp2pgsql-core.c
+++ b/loader/shp2pgsql-core.c
@@ -1363,9 +1363,10 @@ ShpLoaderGetSQLHeader(SHPLOADERSTATE *state, char **strheader)
 			/* First output the raw field type string */
 			stringbuffer_aprintf(sb, "%s", state->pgfieldtypes[j]);
 
-			/* Some types do have typmods though... */
-			if (!strcmp("varchar", state->pgfieldtypes[j]))
-				stringbuffer_aprintf(sb, "(%d)", state->widths[j]);
+			/* Some types do have typmods */
+			/* Apply width typmod for varchar if there is positive width **/
+			if (!strcmp("varchar", state->pgfieldtypes[j]) && state->widths[j] > 0)
+					stringbuffer_aprintf(sb, "(%d)", state->widths[j]);
 
 			if (!strcmp("numeric", state->pgfieldtypes[j]))
 			{
diff --git a/regress/loader/CharNoWidth.dbf b/regress/loader/CharNoWidth.dbf
new file mode 100644
index 000000000..9edcc7d04
Binary files /dev/null and b/regress/loader/CharNoWidth.dbf differ
diff --git a/regress/loader/CharNoWidth.select.expected b/regress/loader/CharNoWidth.select.expected
new file mode 100644
index 000000000..3cd81d490
--- /dev/null
+++ b/regress/loader/CharNoWidth.select.expected
@@ -0,0 +1,18 @@
+1|11|50000|02390665|1150000|Washington|Washington city|25|C5|||G4110|N|158316184|18709787|+38.9042474|-077.0165167
+aland|
+awater|
+classfp|2
+funcstat|1
+geoid|7
+gid|
+intptlat|11
+intptlon|12
+lsad|2
+mtfcc|5
+name|100
+namelsad|100
+pcicbsa|
+pcinecta|
+placefp|5
+placens|8
+statefp|2
diff --git a/regress/loader/CharNoWidth.select.sql b/regress/loader/CharNoWidth.select.sql
new file mode 100644
index 000000000..c7ccb2e01
--- /dev/null
+++ b/regress/loader/CharNoWidth.select.sql
@@ -0,0 +1,3 @@
+SET CLIENT_ENCODING to UTF8;
+SELECT * FROM loadedshp;
+SELECT column_name, character_maximum_length FROM information_schema.columns WHERE table_name = 'loadedshp' ORDER BY column_name;
diff --git a/regress/loader/tests.mk b/regress/loader/tests.mk
index f6be1df56..924f569af 100644
--- a/regress/loader/tests.mk
+++ b/regress/loader/tests.mk
@@ -39,4 +39,5 @@ TESTS += \
 	$(topsrcdir)/regress/loader/Latin1-implicit \
 	$(topsrcdir)/regress/loader/mfile \
 	$(topsrcdir)/regress/loader/TestSkipANALYZE \
-	$(topsrcdir)/regress/loader/TestANALYZE
+	$(topsrcdir)/regress/loader/TestANALYZE \
+	$(topsrcdir)/regress/loader/CharNoWidth

commit ca58cb5f419ac70789bfc91658224df5c1407b7c
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Nov 3 20:42:44 2022 -0400

    Change berries to test geos 3.11 latest branch  (3.11.1)

diff --git a/ci/berrie/configs.sh b/ci/berrie/configs.sh
index b91a960a3..9426fb598 100644
--- a/ci/berrie/configs.sh
+++ b/ci/berrie/configs.sh
@@ -1,5 +1,5 @@
 export WORKSPACE=/home/jenkins/workspace
-export GEOS_VER=3.11.0
+export GEOS_VER=3.11.1
 
 export OS_BUILD=32
 export PG_VER=15
diff --git a/ci/berrie64/configs.sh b/ci/berrie64/configs.sh
index aa6d39049..745b6edbd 100644
--- a/ci/berrie64/configs.sh
+++ b/ci/berrie64/configs.sh
@@ -1,5 +1,5 @@
 export WORKSPACE=/home/jenkins/workspace
-export GEOS_VER=3.11.0
+export GEOS_VER=3.11.1
 
 export OS_BUILD=64
 export PG_VER=15

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                       |   1 +
 ci/berrie/configs.sh                       |   2 +-
 ci/berrie64/configs.sh                     |   2 +-
 loader/shp2pgsql-core.c                    |   7 ++++---
 regress/loader/CharNoWidth.dbf             | Bin 0 -> 830 bytes
 regress/loader/CharNoWidth.select.expected |  18 ++++++++++++++++++
 regress/loader/CharNoWidth.select.sql      |   3 +++
 regress/loader/tests.mk                    |   3 ++-
 8 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 regress/loader/CharNoWidth.dbf
 create mode 100644 regress/loader/CharNoWidth.select.expected
 create mode 100644 regress/loader/CharNoWidth.select.sql


hooks/post-receive
-- 
PostGIS