rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

With ecpg exclusion removed, re-run pgindent for 9.4 

Report by Tom Lane
This commit is contained in:
Bruce Momjian 2014-05-06 20:39:28 -04:00
parent 9516668e48
commit 84288a86ac
7 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/adt/jsonb_util.c
View File

@ -953,10 +953,10 @@ JsonbDeepContains(JsonbIterator **val, JsonbIterator **mContained)
* arrays. * arrays.
* *
* A raw scalar may contain another raw scalar, and an array may * A raw scalar may contain another raw scalar, and an array may
* contain a raw scalar, but a raw scalar may not contain an array. * contain a raw scalar, but a raw scalar may not contain an array. We
* We don't do something like this for the object case, since objects * don't do something like this for the object case, since objects can
* can only contain pairs, never raw scalars (a pair is represented by * only contain pairs, never raw scalars (a pair is represented by an
* an rhs object argument with a single contained pair). * rhs object argument with a single contained pair).
*/ */
if (vval.val.array.rawScalar && !vcontained.val.array.rawScalar) if (vval.val.array.rawScalar && !vcontained.val.array.rawScalar)
return false; return false;

10
src/interfaces/ecpg/include/sqlda.h
View File

@ -4,15 +4,15 @@
#ifdef _ECPG_INFORMIX_H #ifdef _ECPG_INFORMIX_H
#include "sqlda-compat.h" #include "sqlda-compat.h"
typedef struct sqlvar_compat sqlvar_t; typedef struct sqlvar_compat sqlvar_t;
typedef struct sqlda_compat sqlda_t; typedef struct sqlda_compat sqlda_t;
#else #else
#include "sqlda-native.h" #include "sqlda-native.h"
typedef struct sqlvar_struct sqlvar_t; typedef struct sqlvar_struct sqlvar_t;
typedef struct sqlda_struct sqlda_t; typedef struct sqlda_struct sqlda_t;
#endif #endif
#endif /* ECPG_SQLDA_H */ #endif /* ECPG_SQLDA_H */

36
src/interfaces/ecpg/include/sqltypes.h
View File

@ -32,26 +32,26 @@
/* /*
* Values used in sqlda->sqlvar[i]->sqltype * Values used in sqlda->sqlvar[i]->sqltype
*/ */
#define SQLCHAR ECPGt_char #define SQLCHAR ECPGt_char
#define SQLSMINT ECPGt_short #define SQLSMINT ECPGt_short
#define SQLINT ECPGt_int #define SQLINT ECPGt_int
#define SQLFLOAT ECPGt_double #define SQLFLOAT ECPGt_double
#define SQLSMFLOAT ECPGt_float #define SQLSMFLOAT ECPGt_float
#define SQLDECIMAL ECPGt_decimal #define SQLDECIMAL ECPGt_decimal
#define SQLSERIAL ECPGt_int #define SQLSERIAL ECPGt_int
#define SQLDATE ECPGt_date #define SQLDATE ECPGt_date
#define SQLDTIME ECPGt_timestamp #define SQLDTIME ECPGt_timestamp
#define SQLTEXT ECPGt_char #define SQLTEXT ECPGt_char
#define SQLVCHAR ECPGt_char #define SQLVCHAR ECPGt_char
#define SQLINTERVAL ECPGt_interval #define SQLINTERVAL ECPGt_interval
#define SQLNCHAR ECPGt_char #define SQLNCHAR ECPGt_char
#define SQLNVCHAR ECPGt_char #define SQLNVCHAR ECPGt_char
#ifdef HAVE_LONG_LONG_INT_64 #ifdef HAVE_LONG_LONG_INT_64
#define SQLINT8 ECPGt_long_long #define SQLINT8 ECPGt_long_long
#define SQLSERIAL8 ECPGt_long_long #define SQLSERIAL8 ECPGt_long_long
#else #else
#define SQLINT8 ECPGt_long #define SQLINT8 ECPGt_long
#define SQLSERIAL8 ECPGt_long #define SQLSERIAL8 ECPGt_long
#endif #endif
#endif /* ndef ECPG_SQLTYPES_H */ #endif /* ndef ECPG_SQLTYPES_H */

10
src/interfaces/ecpg/test/expected/compat_informix-describe.c
View File

@ -30,18 +30,18 @@
#ifdef _ECPG_INFORMIX_H #ifdef _ECPG_INFORMIX_H
#include "sqlda-compat.h" #include "sqlda-compat.h"
typedef struct sqlvar_compat sqlvar_t; typedef struct sqlvar_compat sqlvar_t;
typedef struct sqlda_compat sqlda_t; typedef struct sqlda_compat sqlda_t;
#else #else
#include "sqlda-native.h" #include "sqlda-native.h"
typedef struct sqlvar_struct sqlvar_t; typedef struct sqlvar_struct sqlvar_t;
typedef struct sqlda_struct sqlda_t; typedef struct sqlda_struct sqlda_t;
#endif #endif
#endif /* ECPG_SQLDA_H */ #endif /* ECPG_SQLDA_H */
#line 5 "describe.pgc" #line 5 "describe.pgc"

46
src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
View File

@ -32,18 +32,18 @@
#ifdef _ECPG_INFORMIX_H #ifdef _ECPG_INFORMIX_H
#include "sqlda-compat.h" #include "sqlda-compat.h"
typedef struct sqlvar_compat sqlvar_t; typedef struct sqlvar_compat sqlvar_t;
typedef struct sqlda_compat sqlda_t; typedef struct sqlda_compat sqlda_t;
#else #else
#include "sqlda-native.h" #include "sqlda-native.h"
typedef struct sqlvar_struct sqlvar_t; typedef struct sqlvar_struct sqlvar_t;
typedef struct sqlda_struct sqlda_t; typedef struct sqlda_struct sqlda_t;
#endif #endif
#endif /* ECPG_SQLDA_H */ #endif /* ECPG_SQLDA_H */
#line 7 "sqlda.pgc" #line 7 "sqlda.pgc"
@ -83,26 +83,26 @@ typedef struct sqlda_struct sqlda_t;
/* /*
* Values used in sqlda->sqlvar[i]->sqltype * Values used in sqlda->sqlvar[i]->sqltype
*/ */
#define SQLCHAR ECPGt_char #define SQLCHAR ECPGt_char
#define SQLSMINT ECPGt_short #define SQLSMINT ECPGt_short
#define SQLINT ECPGt_int #define SQLINT ECPGt_int
#define SQLFLOAT ECPGt_double #define SQLFLOAT ECPGt_double
#define SQLSMFLOAT ECPGt_float #define SQLSMFLOAT ECPGt_float
#define SQLDECIMAL ECPGt_decimal #define SQLDECIMAL ECPGt_decimal
#define SQLSERIAL ECPGt_int #define SQLSERIAL ECPGt_int
#define SQLDATE ECPGt_date #define SQLDATE ECPGt_date
#define SQLDTIME ECPGt_timestamp #define SQLDTIME ECPGt_timestamp
#define SQLTEXT ECPGt_char #define SQLTEXT ECPGt_char
#define SQLVCHAR ECPGt_char #define SQLVCHAR ECPGt_char
#define SQLINTERVAL ECPGt_interval #define SQLINTERVAL ECPGt_interval
#define SQLNCHAR ECPGt_char #define SQLNCHAR ECPGt_char
#define SQLNVCHAR ECPGt_char #define SQLNVCHAR ECPGt_char
#ifdef HAVE_LONG_LONG_INT_64 #ifdef HAVE_LONG_LONG_INT_64
#define SQLINT8 ECPGt_long_long #define SQLINT8 ECPGt_long_long
#define SQLSERIAL8 ECPGt_long_long #define SQLSERIAL8 ECPGt_long_long
#else #else
#define SQLINT8 ECPGt_long #define SQLINT8 ECPGt_long
#define SQLSERIAL8 ECPGt_long #define SQLSERIAL8 ECPGt_long
#endif #endif
#endif /* ndef ECPG_SQLTYPES_H */ #endif /* ndef ECPG_SQLTYPES_H */

10
src/interfaces/ecpg/test/expected/sql-describe.c
View File

@ -28,18 +28,18 @@
#ifdef _ECPG_INFORMIX_H #ifdef _ECPG_INFORMIX_H
#include "sqlda-compat.h" #include "sqlda-compat.h"
typedef struct sqlvar_compat sqlvar_t; typedef struct sqlvar_compat sqlvar_t;
typedef struct sqlda_compat sqlda_t; typedef struct sqlda_compat sqlda_t;
#else #else
#include "sqlda-native.h" #include "sqlda-native.h"
typedef struct sqlvar_struct sqlvar_t; typedef struct sqlvar_struct sqlvar_t;
typedef struct sqlda_struct sqlda_t; typedef struct sqlda_struct sqlda_t;
#endif #endif
#endif /* ECPG_SQLDA_H */ #endif /* ECPG_SQLDA_H */
#line 5 "describe.pgc" #line 5 "describe.pgc"

10
src/interfaces/ecpg/test/expected/sql-sqlda.c
View File

@ -30,18 +30,18 @@
#ifdef _ECPG_INFORMIX_H #ifdef _ECPG_INFORMIX_H
#include "sqlda-compat.h" #include "sqlda-compat.h"
typedef struct sqlvar_compat sqlvar_t; typedef struct sqlvar_compat sqlvar_t;
typedef struct sqlda_compat sqlda_t; typedef struct sqlda_compat sqlda_t;
#else #else
#include "sqlda-native.h" #include "sqlda-native.h"
typedef struct sqlvar_struct sqlvar_t; typedef struct sqlvar_struct sqlvar_t;
typedef struct sqlda_struct sqlda_t; typedef struct sqlda_struct sqlda_t;
#endif #endif
#endif /* ECPG_SQLDA_H */ #endif /* ECPG_SQLDA_H */
#line 7 "sqlda.pgc" #line 7 "sqlda.pgc"