[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-984-ge6d6be316
git at osgeo.org
git at osgeo.org
Mon Jun 19 13:22:46 PDT 2023
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, master has been updated
via e6d6be316631881e464778e958b94cda1c270348 (commit)
from 8038c6f4476e54348abef071686397df03d47806 (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 e6d6be316631881e464778e958b94cda1c270348
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Jun 19 22:21:31 2023 +0200
Restore 'installcheck' support for address_standardizer
Closes #5254
Update expected result as trailing blanks were missing
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index cbf35ae28..a13ca6358 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -209,9 +209,13 @@ PERL = @PERL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
abs_topbuilddir=$(abspath $(top_builddir))
+# Overriding top_builddir breaks the "installcheck"
+# target from PGXS. TODO: integrate regression tests
+# with the rest of the application
+#top_builddir = @top_builddir@
+
VPATH = $(srcdir)
INSTALLED_UPGRADE_SCRIPTS += \
diff --git a/extensions/address_standardizer/expected/test-standardize_address_1.out b/extensions/address_standardizer/expected/test-standardize_address_1.out
index c6a01916f..5a12a1dcb 100644
--- a/extensions/address_standardizer/expected/test-standardize_address_1.out
+++ b/extensions/address_standardizer/expected/test-standardize_address_1.out
@@ -1,48 +1,48 @@
select * from parse_address('123 Main Street, Kansas City, MO 45678');
- num | street | street2 | address1 | city | state | zip | zipplus | country
+ num | street | street2 | address1 | city | state | zip | zipplus | country
-----+-------------+---------+-----------------+-------------+-------+-------+---------+---------
123 | Main Street | | 123 Main Street | Kansas City | MO | 45678 | | US
(1 row)
select * from standardize_address('us_lex'::text, 'us_gaz'::text, 'us_rules'::text, '123 Main Street'::text, 'Kansas City, MO 45678'::text);
- building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
----------+-----------+--------+------+---------+------+---------+--------+------------+-------+-------------+----------+---------+----------+-----+------
- | 123 | | | | MAIN | STREET | | | | KANSAS CITY | MISSOURI | | 45678 | |
+ | 123 | | | | MAIN | STREET | | | | KANSAS CITY | MISSOURI | | 45678 | |
(1 row)
SELECT '#2981' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '1566 NEW STATE HWY, RAYNHAM, MA');
- ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
--------+----------+-----------+--------+------+---------+-------------------+---------+--------+------------+-------+---------+---------------+---------+----------+-----+------
- #2981 | | 1566 | | | | NEW STATE HIGHWAY | | | | | RAYNHAM | MASSACHUSETTS | USA | | |
+ #2981 | | 1566 | | | | NEW STATE HIGHWAY | | | | | RAYNHAM | MASSACHUSETTS | USA | | |
(1 row)
SELECT '#2978a' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10-20 DORRANCE ST PROVIDENCE RI' );
- ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
--------+----------+-----------+--------+------+---------+----------+---------+--------+------------+-------+------------+--------------+---------+----------+-----+------
- #2978a | | 10 20 | | | | DORRANCE | STREET | | | | PROVIDENCE | RHODE ISLAND | USA | | |
+ #2978a | | 10 20 | | | | DORRANCE | STREET | | | | PROVIDENCE | RHODE ISLAND | USA | | |
(1 row)
SELECT '#2978b' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10 20 DORRANCE ST PROVIDENCE RI' );
- ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
--------+----------+-----------+--------+------+---------+----------+---------+--------+------------+-------+------------+--------------+---------+----------+-----+------
- #2978b | | 10 20 | | | | DORRANCE | STREET | | | | PROVIDENCE | RHODE ISLAND | USA | | |
+ #2978b | | 10 20 | | | | DORRANCE | STREET | | | | PROVIDENCE | RHODE ISLAND | USA | | |
(1 row)
SELECT '#2978c' As ticket, * FROM standardize_address('us_lex','us_gaz','us_rules', '10-20 DORRANCE ST, PROVIDENCE, RI');
- ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
--------+----------+-----------+--------+------+---------+----------+---------+--------+------------+-------+------------+--------------+---------+----------+-----+------
- #2978c | | 10 20 | | | | DORRANCE | STREET | | | | PROVIDENCE | RHODE ISLAND | USA | | |
+ #2978c | | 10 20 | | | | DORRANCE | STREET | | | | PROVIDENCE | RHODE ISLAND | USA | | |
(1 row)
SELECT '#5299a' AS ticket, * FROM standardize_address('us_lex', 'us_gaz', 'us_rules','1 Timepiece Point','Boston, MA, 02220');
- ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
--------+----------+-----------+--------+------+---------+-----------+---------+--------+------------+-------+--------+---------------+---------+----------+-----+------
- #5299a | | 1 | | | | TIMEPIECE | POINT | | | | BOSTON | MASSACHUSETTS | | 02220 | |
+ #5299a | | 1 | | | | TIMEPIECE | POINT | | | | BOSTON | MASSACHUSETTS | | 02220 | |
(1 row)
SELECT '#5299b' AS ticket, * FROM standardize_address('us_lex', 'us_gaz', 'us_rules','50 Gold Piece Drive','Boston, MA, 02020');
- ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
+ ticket | building | house_num | predir | qual | pretype | name | suftype | sufdir | ruralroute | extra | city | state | country | postcode | box | unit
--------+----------+-----------+--------+------+---------+------------+---------+--------+------------+-------+--------+---------------+---------+----------+-----+------
- #5299b | | 50 | | | | GOLD PIECE | DRIVE | | | | BOSTON | MASSACHUSETTS | | 02020 | |
+ #5299b | | 50 | | | | GOLD PIECE | DRIVE | | | | BOSTON | MASSACHUSETTS | | 02020 | |
(1 row)
-----------------------------------------------------------------------
Summary of changes:
extensions/address_standardizer/Makefile.in | 6 ++++-
.../expected/test-standardize_address_1.out | 30 +++++++++++-----------
2 files changed, 20 insertions(+), 16 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list