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

Commit84288a8

Browse files
committed
With ecpg exclusion removed, re-run pgindent for 9.4
Report by Tom Lane
1 parent9516668 commit84288a8

File tree

7 files changed

+65
-65
lines changed

7 files changed

+65
-65
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -953,10 +953,10 @@ JsonbDeepContains(JsonbIterator **val, JsonbIterator **mContained)
953953
* arrays.
954954
*
955955
* A raw scalar may contain another raw scalar, and an array may
956-
* contain a raw scalar, but a raw scalar may not contain an array.
957-
*Wedon't do something like this for the object case, since objects
958-
*canonly contain pairs, never raw scalars (a pair is represented by
959-
*anrhs object argument with a single contained pair).
956+
* contain a raw scalar, but a raw scalar may not contain an array. We
957+
* don't do something like this for the object case, since objects can
958+
* only contain pairs, never raw scalars (a pair is represented by an
959+
* rhs object argument with a single contained pair).
960960
*/
961961
if (vval.val.array.rawScalar&& !vcontained.val.array.rawScalar)
962962
return false;

‎src/interfaces/ecpg/include/sqlda.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#ifdef_ECPG_INFORMIX_H
55

66
#include"sqlda-compat.h"
7-
typedefstructsqlvar_compatsqlvar_t;
8-
typedefstructsqlda_compatsqlda_t;
7+
typedefstructsqlvar_compatsqlvar_t;
8+
typedefstructsqlda_compatsqlda_t;
99

1010
#else
1111

1212
#include"sqlda-native.h"
13-
typedefstructsqlvar_structsqlvar_t;
14-
typedefstructsqlda_structsqlda_t;
13+
typedefstructsqlvar_structsqlvar_t;
14+
typedefstructsqlda_structsqlda_t;
1515

1616
#endif
1717

18-
#endif/* ECPG_SQLDA_H */
18+
#endif/* ECPG_SQLDA_H */

‎src/interfaces/ecpg/include/sqltypes.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@
3232
/*
3333
* Values used in sqlda->sqlvar[i]->sqltype
3434
*/
35-
#defineSQLCHARECPGt_char
36-
#defineSQLSMINTECPGt_short
37-
#defineSQLINTECPGt_int
38-
#defineSQLFLOATECPGt_double
39-
#defineSQLSMFLOATECPGt_float
40-
#defineSQLDECIMALECPGt_decimal
41-
#defineSQLSERIALECPGt_int
42-
#defineSQLDATEECPGt_date
43-
#defineSQLDTIMEECPGt_timestamp
44-
#defineSQLTEXTECPGt_char
45-
#defineSQLVCHARECPGt_char
46-
#defineSQLINTERVALECPGt_interval
47-
#defineSQLNCHARECPGt_char
48-
#defineSQLNVCHARECPGt_char
35+
#defineSQLCHARECPGt_char
36+
#defineSQLSMINTECPGt_short
37+
#defineSQLINTECPGt_int
38+
#defineSQLFLOATECPGt_double
39+
#defineSQLSMFLOATECPGt_float
40+
#defineSQLDECIMALECPGt_decimal
41+
#defineSQLSERIALECPGt_int
42+
#defineSQLDATEECPGt_date
43+
#defineSQLDTIMEECPGt_timestamp
44+
#defineSQLTEXTECPGt_char
45+
#defineSQLVCHARECPGt_char
46+
#defineSQLINTERVALECPGt_interval
47+
#defineSQLNCHARECPGt_char
48+
#defineSQLNVCHARECPGt_char
4949
#ifdefHAVE_LONG_LONG_INT_64
50-
#defineSQLINT8ECPGt_long_long
51-
#defineSQLSERIAL8ECPGt_long_long
50+
#defineSQLINT8ECPGt_long_long
51+
#defineSQLSERIAL8ECPGt_long_long
5252
#else
53-
#defineSQLINT8ECPGt_long
54-
#defineSQLSERIAL8ECPGt_long
53+
#defineSQLINT8ECPGt_long
54+
#defineSQLSERIAL8ECPGt_long
5555
#endif
5656

5757
#endif/* ndef ECPG_SQLTYPES_H */

‎src/interfaces/ecpg/test/expected/compat_informix-describe.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
#ifdef_ECPG_INFORMIX_H
3131

3232
#include"sqlda-compat.h"
33-
typedefstructsqlvar_compatsqlvar_t;
34-
typedefstructsqlda_compatsqlda_t;
33+
typedefstructsqlvar_compatsqlvar_t;
34+
typedefstructsqlda_compatsqlda_t;
3535

3636
#else
3737

3838
#include"sqlda-native.h"
39-
typedefstructsqlvar_structsqlvar_t;
40-
typedefstructsqlda_structsqlda_t;
39+
typedefstructsqlvar_structsqlvar_t;
40+
typedefstructsqlda_structsqlda_t;
4141

4242
#endif
4343

44-
#endif/* ECPG_SQLDA_H */
44+
#endif/* ECPG_SQLDA_H */
4545

4646
#line 5 "describe.pgc"
4747

‎src/interfaces/ecpg/test/expected/compat_informix-sqlda.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
#ifdef_ECPG_INFORMIX_H
3333

3434
#include"sqlda-compat.h"
35-
typedefstructsqlvar_compatsqlvar_t;
36-
typedefstructsqlda_compatsqlda_t;
35+
typedefstructsqlvar_compatsqlvar_t;
36+
typedefstructsqlda_compatsqlda_t;
3737

3838
#else
3939

4040
#include"sqlda-native.h"
41-
typedefstructsqlvar_structsqlvar_t;
42-
typedefstructsqlda_structsqlda_t;
41+
typedefstructsqlvar_structsqlvar_t;
42+
typedefstructsqlda_structsqlda_t;
4343

4444
#endif
4545

46-
#endif/* ECPG_SQLDA_H */
46+
#endif/* ECPG_SQLDA_H */
4747

4848
#line 7 "sqlda.pgc"
4949

@@ -83,26 +83,26 @@ typedef struct sqlda_structsqlda_t;
8383
/*
8484
* Values used in sqlda->sqlvar[i]->sqltype
8585
*/
86-
#defineSQLCHARECPGt_char
87-
#defineSQLSMINTECPGt_short
88-
#defineSQLINTECPGt_int
89-
#defineSQLFLOATECPGt_double
90-
#defineSQLSMFLOATECPGt_float
91-
#defineSQLDECIMALECPGt_decimal
92-
#defineSQLSERIALECPGt_int
93-
#defineSQLDATEECPGt_date
94-
#defineSQLDTIMEECPGt_timestamp
95-
#defineSQLTEXTECPGt_char
96-
#defineSQLVCHARECPGt_char
97-
#defineSQLINTERVALECPGt_interval
98-
#defineSQLNCHARECPGt_char
99-
#defineSQLNVCHARECPGt_char
86+
#defineSQLCHARECPGt_char
87+
#defineSQLSMINTECPGt_short
88+
#defineSQLINTECPGt_int
89+
#defineSQLFLOATECPGt_double
90+
#defineSQLSMFLOATECPGt_float
91+
#defineSQLDECIMALECPGt_decimal
92+
#defineSQLSERIALECPGt_int
93+
#defineSQLDATEECPGt_date
94+
#defineSQLDTIMEECPGt_timestamp
95+
#defineSQLTEXTECPGt_char
96+
#defineSQLVCHARECPGt_char
97+
#defineSQLINTERVALECPGt_interval
98+
#defineSQLNCHARECPGt_char
99+
#defineSQLNVCHARECPGt_char
100100
#ifdefHAVE_LONG_LONG_INT_64
101-
#defineSQLINT8ECPGt_long_long
102-
#defineSQLSERIAL8ECPGt_long_long
101+
#defineSQLINT8ECPGt_long_long
102+
#defineSQLSERIAL8ECPGt_long_long
103103
#else
104-
#defineSQLINT8ECPGt_long
105-
#defineSQLSERIAL8ECPGt_long
104+
#defineSQLINT8ECPGt_long
105+
#defineSQLSERIAL8ECPGt_long
106106
#endif
107107

108108
#endif/* ndef ECPG_SQLTYPES_H */

‎src/interfaces/ecpg/test/expected/sql-describe.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
#ifdef_ECPG_INFORMIX_H
2929

3030
#include"sqlda-compat.h"
31-
typedefstructsqlvar_compatsqlvar_t;
32-
typedefstructsqlda_compatsqlda_t;
31+
typedefstructsqlvar_compatsqlvar_t;
32+
typedefstructsqlda_compatsqlda_t;
3333

3434
#else
3535

3636
#include"sqlda-native.h"
37-
typedefstructsqlvar_structsqlvar_t;
38-
typedefstructsqlda_structsqlda_t;
37+
typedefstructsqlvar_structsqlvar_t;
38+
typedefstructsqlda_structsqlda_t;
3939

4040
#endif
4141

42-
#endif/* ECPG_SQLDA_H */
42+
#endif/* ECPG_SQLDA_H */
4343

4444
#line 5 "describe.pgc"
4545

‎src/interfaces/ecpg/test/expected/sql-sqlda.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
#ifdef_ECPG_INFORMIX_H
3131

3232
#include"sqlda-compat.h"
33-
typedefstructsqlvar_compatsqlvar_t;
34-
typedefstructsqlda_compatsqlda_t;
33+
typedefstructsqlvar_compatsqlvar_t;
34+
typedefstructsqlda_compatsqlda_t;
3535

3636
#else
3737

3838
#include"sqlda-native.h"
39-
typedefstructsqlvar_structsqlvar_t;
40-
typedefstructsqlda_structsqlda_t;
39+
typedefstructsqlvar_structsqlvar_t;
40+
typedefstructsqlda_structsqlda_t;
4141

4242
#endif
4343

44-
#endif/* ECPG_SQLDA_H */
44+
#endif/* ECPG_SQLDA_H */
4545

4646
#line 7 "sqlda.pgc"
4747

0 commit comments

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