NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7881bb1

committed

Correctly cast types to Datum and back in compareDatetime()

Discussion:https://postgr.es/m/CAPpHfdteFKW6MLpXM4md99m55YAuXs0n9_P2wiTq_EmG09doUA%40mail.gmail.com

1 parentb81a9c2 commit7881bb1Copy full SHA for 7881bb1

File tree

1 file changed

-6

lines changed

src/backend/utils/adt
- jsonpath_exec.c

1 file changed

-6

lines changed

`‎src/backend/utils/adt/jsonpath_exec.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2592,7 +2592,7 @@ compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2,`
`2592`	`2592`	`break;`
`2593`	`2593`
`2594`	`2594`	`caseTIMESTAMPOID:`
`2595`		`-val1=date2timestamp_opt_error(val1,have_error);`
	`2595`	`+val1=TimestampGetDatum(date2timestamp_opt_error(DatumGetDateADT(val1),have_error));`
`2596`	`2596`	`if (have_error&&*have_error)`
`2597`	`2597`	`return0;`
`2598`	`2598`	`cmpfunc=timestamp_cmp;`
`@@ -2606,7 +2606,7 @@ compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2,`
`2606`	`2606`	`errmsg("cannot convert value from %s to %s without timezone usage",`
`2607`	`2607`	`"date","timestamptz"),`
`2608`	`2608`	`errhint("use *_tz() function for timezone support")));`
`2609`		`-val1=date2timestamptz_opt_error(val1,have_error);`
	`2609`	`+val1=TimestampTzGetDatum(date2timestamptz_opt_error(DatumGetDateADT(val1),have_error));`
`2610`	`2610`	`if (have_error&&*have_error)`
`2611`	`2611`	`return0;`
`2612`	`2612`	`cmpfunc=timestamp_cmp;`
`@@ -2680,7 +2680,7 @@ compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2,`
`2680`	`2680`	`switch (typid2)`
`2681`	`2681`	`{`
`2682`	`2682`	`caseDATEOID:`
`2683`		`-val2=date2timestamp_opt_error(val2,have_error);`
	`2683`	`+val2=TimestampGetDatum(date2timestamp_opt_error(DatumGetDateADT(val2),have_error));`
`2684`	`2684`	`if (have_error&&*have_error)`
`2685`	`2685`	`return0;`
`2686`	`2686`	`cmpfunc=timestamp_cmp;`
`@@ -2699,7 +2699,7 @@ compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2,`
`2699`	`2699`	`errmsg("cannot convert value from %s to %s without timezone usage",`
`2700`	`2700`	`"timestamp","timestamptz"),`
`2701`	`2701`	`errhint("use *_tz() function for timezone support")));`
`2702`		`-val1=timestamp2timestamptz_opt_error(val1,have_error);`
	`2702`	`+val1=TimestampTzGetDatum(timestamp2timestamptz_opt_error(DatumGetTimestamp(val1),have_error));`
`2703`	`2703`	`if (have_error&&*have_error)`
`2704`	`2704`	`return0;`
`2705`	`2705`	`cmpfunc=timestamp_cmp;`
`@@ -2723,7 +2723,7 @@ compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2,`
`2723`	`2723`	`errmsg("cannot convert value from %s to %s without timezone usage",`
`2724`	`2724`	`"date","timestamptz"),`
`2725`	`2725`	`errhint("use *_tz() function for timezone support")));`
`2726`		`-val2=date2timestamptz_opt_error(val2,have_error);`
	`2726`	`+val2=TimestampTzGetDatum(date2timestamptz_opt_error(DatumGetDateADT(val2),have_error));`
`2727`	`2727`	`if (have_error&&*have_error)`
`2728`	`2728`	`return0;`
`2729`	`2729`	`cmpfunc=timestamp_cmp;`
`@@ -2737,7 +2737,7 @@ compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2,`
`2737`	`2737`	`errmsg("cannot convert value from %s to %s without timezone usage",`
`2738`	`2738`	`"timestamp","timestamptz"),`
`2739`	`2739`	`errhint("use *_tz() function for timezone support")));`
`2740`		`-val2=timestamp2timestamptz_opt_error(val2,have_error);`
	`2740`	`+val2=TimestampTzGetDatum(timestamp2timestamptz_opt_error(DatumGetTimestamp(val2),have_error));`
`2741`	`2741`	`if (have_error&&*have_error)`
`2742`	`2742`	`return0;`
`2743`	`2743`	`cmpfunc=timestamp_cmp;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7881bb1

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/jsonpath_exec.c`

0 commit comments