Commit6656588

committed

Improve interval_transform function to detect a few more cases.

Noah Misch, per a review comment from me.

1 parentd7ea919 commit6656588Copy full SHA for 6656588

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -958,6 +958,7 @@ interval_transform(PG_FUNCTION_ARGS)`
`958`	`958`	`intnew_range=INTERVAL_RANGE(new_typmod);`
`959`	`959`	`intnew_precis=INTERVAL_PRECISION(new_typmod);`
`960`	`960`	`intnew_range_fls;`
	`961`	`+intold_range_fls;`
`961`	`962`
`962`	`963`	`if (old_typmod==-1)`
`963`	`964`	`{`
`@@ -974,12 +975,16 @@ interval_transform(PG_FUNCTION_ARGS)`
`974`	`975`	`* Temporally-smaller fields occupy higher positions in the range`
`975`	`976`	`* bitmap. Since only the temporally-smallest bit matters for length`
`976`	`977`	`* coercion purposes, we compare the last-set bits in the ranges.`
	`978`	`+ * Precision, which is to say, sub-second precision, only affects`
	`979`	`+ * ranges that include SECOND.`
`977`	`980`	`*/`
`978`	`981`	`new_range_fls=fls(new_range);`
	`982`	`+old_range_fls=fls(old_range);`
`979`	`983`	`if (new_typmod==-1\|\|`
`980`	`984`	`((new_range_fls >=SECOND\|\|`
`981`		`-new_range_fls >=fls(old_range))&&`
`982`		`- (new_precis >=MAX_INTERVAL_PRECISION\|\|`
	`985`	`+new_range_fls >=old_range_fls)&&`
	`986`	`+ (old_range_fls<SECOND\|\|`
	`987`	`+new_precis >=MAX_INTERVAL_PRECISION\|\|`
`983`	`988`	`new_precis >=old_precis)))`
`984`	`989`	`ret=relabel_to_typmod(source,new_typmod);`
`985`	`990`	`}`

Comments

(0)