Commit2c91493

committed

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

subpath(ltree,0,0) returns ''.

1 parentfd4c775 commit2c91493Copy full SHA for 2c91493

File tree

-8

lines changed

-8

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,15 +74,15 @@ SELECT subpath('Top.Child1.Child2',0,-1);`
`74`	`74`	`(1 row)`
`75`	`75`
`76`	`76`	`SELECT subpath('Top.Child1.Child2',0,0);`
`77`		`-subpath`
`78`		`--------------------`
`79`		`-Top.Child1.Child2`
	`77`	`+ subpath`
	`78`	`+---------`
	`79`	`+`
`80`	`80`	`(1 row)`
`81`	`81`
`82`	`82`	`SELECT subpath('Top.Child1.Child2',1,0);`
`83`		`-subpath`
`84`		`----------------`
`85`		`-Child1.Child2`
	`83`	`+ subpath`
	`84`	`+---------`
	`85`	`+`
`86`	`86`	`(1 row)`
`87`	`87`
`88`	`88`	`SELECT subpath('Top.Child1.Child2',0);`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,12 +196,13 @@ inner_subltree(ltree * t, int4 startpos, int4 endpos)`
`196`	`196`	`ltree*res;`
`197`	`197`	`inti;`
`198`	`198`
`199`		`-if (startpos<0\|\|endpos<0\|\|startpos >=t->numlevel\|\|startpos >=endpos)`
	`199`	`+if (startpos<0\|\|endpos<0\|\|startpos >=t->numlevel\|\|startpos>endpos)`
`200`	`200`	`elog(ERROR,"Wrong positions");`
`201`	`201`
`202`	`202`	`if (endpos>t->numlevel)`
`203`	`203`	`endpos=t->numlevel;`
`204`	`204`
	`205`	`+start=end= (char*)ptr;`
`205`	`206`	`for (i=0;i<endpos;i++)`
`206`	`207`	`{`
`207`	`208`	`if (i==startpos)`
`@@ -258,7 +259,7 @@ subpath(PG_FUNCTION_ARGS)`
`258`	`259`	`if (len<0)`
`259`	`260`	`end=t->numlevel+len;`
`260`	`261`	`elseif (len==0)`
`261`		`-end=0xffff;`
	`262`	`+end=(fcinfo->nargs==3) ?start :0xffff;`
`262`	`263`
`263`	`264`	`res=inner_subltree(t,start,end);`
`264`	`265`

Comments

(0)