Fix subpath and subltree. Allow to return '' value.

subpath(ltree,0,0) returns ''.
This commit is contained in:
Teodor Sigaev 2003-07-18 13:27:43 +00:00
parent fd4c775481
commit 2c914937c1
2 changed files with 9 additions and 8 deletions

View file

@ -74,15 +74,15 @@ SELECT subpath('Top.Child1.Child2',0,-1);
(1 row)
SELECT subpath('Top.Child1.Child2',0,0);
subpath
-------------------
Top.Child1.Child2
subpath
---------
(1 row)
SELECT subpath('Top.Child1.Child2',1,0);
subpath
---------------
Child1.Child2
subpath
---------
(1 row)
SELECT subpath('Top.Child1.Child2',0);

View file

@ -196,12 +196,13 @@ inner_subltree(ltree * t, int4 startpos, int4 endpos)
ltree *res;
int i;
if (startpos < 0 || endpos < 0 || startpos >= t->numlevel || startpos >= endpos)
if (startpos < 0 || endpos < 0 || startpos >= t->numlevel || startpos > endpos)
elog(ERROR, "Wrong positions");
if (endpos > t->numlevel)
endpos = t->numlevel;
start = end = (char *) ptr;
for (i = 0; i < endpos; i++)
{
if (i == startpos)
@ -258,7 +259,7 @@ subpath(PG_FUNCTION_ARGS)
if (len < 0)
end = t->numlevel + len;
else if (len == 0)
end = 0xffff;
end = (fcinfo->nargs == 3) ? start : 0xffff;
res = inner_subltree(t, start, end);