Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfbcf2cf

Browse files
committed
Fix an ancient typo that prevented the detection of conflicting fields when
interval input "invalid" was specified together with other fields. Spottedby Neil Conway with the help of a clang warning. Although this has beenwrong since the interval code was written more than 10 years ago, it doesn'taffect anything beyond which error message you get for a wrong input, so notworth back-patching very far.
1 parent67becf8 commitfbcf2cf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎src/backend/utils/adt/datetime.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.212 2010/05/09 02:15:59 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.213 2010/08/02 01:24:53 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -3098,7 +3098,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
30983098
break;
30993099

31003100
caseRESERV:
3101-
tmask= (DTK_DATE_M||DTK_TIME_M);
3101+
tmask= (DTK_DATE_M |DTK_TIME_M);
31023102
*dtype=val;
31033103
break;
31043104

‎src/interfaces/ecpg/pgtypeslib/interval.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.42 2009/09/03 09:59:20 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.43 2010/08/02 01:24:54 tgl Exp $ */
22

33
#include"postgres_fe.h"
44
#include<time.h>
@@ -606,7 +606,7 @@ DecodeInterval(char **field, int *ftype, int nf,/* int range, */
606606
break;
607607

608608
caseRESERV:
609-
tmask= (DTK_DATE_M||DTK_TIME_M);
609+
tmask= (DTK_DATE_M |DTK_TIME_M);
610610
*dtype=val;
611611
break;
612612

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp