Support for CTEs in pgsql2shp. References #5018 for PostGIS 3.2.0. Also minor news cleanup

NEWS

@@ -1,7 +1,8 @@
 PostGIS 3.2.0beta2
 2021/xx/xx
   * Breaking changes / fixes *
-  - loader: Respect LDFLAGS (Greg Troxel)
+  - #5016, loader (shp2pgsq): Respect LDFLAGS (Greg Troxel)
+  - #5018, pgsql2shp basic support for WITH CTE clause (Regina Obe)
 
 PostGIS 3.2.0
 2021/xx/xx

loader/pgsql2shp-cli.c

@@ -136,9 +136,12 @@ main(int argc, char **argv)
 	   it's a user-defined query then set that instead */
 	if (pgis_optind < argc)
 	{
-		/* User-defined queries begin with SELECT */
-		if (!strncmp(argv[pgis_optind], "SELECT ", 7) ||
-			!strncmp(argv[pgis_optind], "select ", 7))
+		/* User-defined queries begin with SELECT or WITH */
+		if ( !strncmp(argv[pgis_optind], "SELECT ", 7) ||
+			!strncmp(argv[pgis_optind], "select ", 7) ||
+			!strncmp(argv[pgis_optind], "WITH ", 5) ||
+			!strncmp(argv[pgis_optind], "with ", 5)
+		)
 		{
 			config->usrquery = argv[pgis_optind];
 		}

regress/dumper/tests.mk

@@ -15,4 +15,5 @@ TESTS += \
 	$(topsrcdir)/regress/dumper/literalsrid \
 	$(topsrcdir)/regress/dumper/realtable \
 	$(topsrcdir)/regress/dumper/nullsintable \
-	$(topsrcdir)/regress/dumper/null3d
+	$(topsrcdir)/regress/dumper/null3d \
+	$(topsrcdir)/regress/dumper/withclause

regress/dumper/withclause.dmp

@@ -0,0 +1 @@
+WITH m(address, some_very_long_name, color, geom) AS ( VALUES ('This is Test 1', 'TT1', 'red', ST_Point(0, 0)), ('This is Test 2', 'TT2', 'green', ST_Point(0, 100) ) ) SELECT * FROM m

regress/dumper/withclause_expected.cpg

@@ -0,0 +1 @@
+UTF-8