diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-04-07 20:50:02 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-04-07 20:50:02 -0400 |
| commit | ebd194ac58f8df3620d17bc5f1824f9833794b98 (patch) | |
| tree | 200505f64aef55764d875ef11db6300276cbe084 | |
| parent | dbb121038c74ba4491afc5a63c48b9e780c0ae12 (diff) | |
| download | postgresql-ebd194ac58f8df3620d17bc5f1824f9833794b98.tar.gz postgresql-ebd194ac58f8df3620d17bc5f1824f9833794b98.zip | |
Fix circle_in to accept "(x,y),r" as it's advertised to do.
Our documentation describes four allowed input syntaxes for circles,
but the regression tests tried only three ... with predictable
consequences. Remarkably, this has been wrong since the circle
datatype was added in 1997, but nobody noticed till now.
David Zhang, with some help from me
Discussion: https://postgr.es/m/332c47fa-d951-7574-b5cc-a8f7f7201202@highgo.ca
| -rw-r--r-- | src/backend/utils/adt/geo_ops.c | 13 | ||||
| -rw-r--r-- | src/test/regress/expected/circle.out | 10 | ||||
| -rw-r--r-- | src/test/regress/sql/circle.sql | 10 |
3 files changed, 18 insertions, 15 deletions
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index dfb71a2f4ed..e24d75ff24d 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -4596,8 +4596,8 @@ poly_path(PG_FUNCTION_ARGS) /* circle_in - convert a string to internal form. * * External format: (center and radius of circle) - * "((f8,f8)<f8>)" - * also supports quick entry style "(f8,f8,f8)" + * "<(f8,f8),f8>" + * also supports quick entry style "f8,f8,f8" */ Datum circle_in(PG_FUNCTION_ARGS) @@ -4613,16 +4613,19 @@ circle_in(PG_FUNCTION_ARGS) s = str; while (isspace((unsigned char) *s)) s++; - if ((*s == LDELIM_C) || (*s == LDELIM)) + if (*s == LDELIM_C) + depth++, s++; + else if (*s == LDELIM) { - depth++; + /* If there are two left parens, consume the first one */ cp = (s + 1); while (isspace((unsigned char) *cp)) cp++; if (*cp == LDELIM) - s = cp; + depth++, s = cp; } + /* pair_decode will consume parens around the pair, if any */ if (!pair_decode(s, &circle->center.x, &circle->center.y, &s)) ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), diff --git a/src/test/regress/expected/circle.out b/src/test/regress/expected/circle.out index 9ba4a0495d2..047bc352650 100644 --- a/src/test/regress/expected/circle.out +++ b/src/test/regress/expected/circle.out @@ -3,11 +3,11 @@ -- CREATE TABLE CIRCLE_TBL (f1 circle); INSERT INTO CIRCLE_TBL VALUES ('<(5,1),3>'); -INSERT INTO CIRCLE_TBL VALUES ('<(1,2),100>'); -INSERT INTO CIRCLE_TBL VALUES ('1,3,5'); -INSERT INTO CIRCLE_TBL VALUES ('((1,2),3)'); -INSERT INTO CIRCLE_TBL VALUES ('<(100,200),10>'); -INSERT INTO CIRCLE_TBL VALUES ('<(100,1),115>'); +INSERT INTO CIRCLE_TBL VALUES ('((1,2),100)'); +INSERT INTO CIRCLE_TBL VALUES (' 1 , 3 , 5 '); +INSERT INTO CIRCLE_TBL VALUES (' ( ( 1 , 2 ) , 3 ) '); +INSERT INTO CIRCLE_TBL VALUES (' ( 100 , 200 ) , 10 '); +INSERT INTO CIRCLE_TBL VALUES (' < ( 100 , 1 ) , 115 > '); -- bad values INSERT INTO CIRCLE_TBL VALUES ('<(-100,0),-100>'); ERROR: invalid input syntax for type circle: "<(-100,0),-100>" diff --git a/src/test/regress/sql/circle.sql b/src/test/regress/sql/circle.sql index c0284b2b598..8dd4445b0e6 100644 --- a/src/test/regress/sql/circle.sql +++ b/src/test/regress/sql/circle.sql @@ -6,15 +6,15 @@ CREATE TABLE CIRCLE_TBL (f1 circle); INSERT INTO CIRCLE_TBL VALUES ('<(5,1),3>'); -INSERT INTO CIRCLE_TBL VALUES ('<(1,2),100>'); +INSERT INTO CIRCLE_TBL VALUES ('((1,2),100)'); -INSERT INTO CIRCLE_TBL VALUES ('1,3,5'); +INSERT INTO CIRCLE_TBL VALUES (' 1 , 3 , 5 '); -INSERT INTO CIRCLE_TBL VALUES ('((1,2),3)'); +INSERT INTO CIRCLE_TBL VALUES (' ( ( 1 , 2 ) , 3 ) '); -INSERT INTO CIRCLE_TBL VALUES ('<(100,200),10>'); +INSERT INTO CIRCLE_TBL VALUES (' ( 100 , 200 ) , 10 '); -INSERT INTO CIRCLE_TBL VALUES ('<(100,1),115>'); +INSERT INTO CIRCLE_TBL VALUES (' < ( 100 , 1 ) , 115 > '); -- bad values |