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

Commit78772dc

Browse files
author
Michael Meskes
committed
*** empty log message ***
1 parent0fa15b9 commit78772dc

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,4 +2307,7 @@ Wed, 06 Feb 2008 09:04:48 +0100
23072307
- Fixed segfault in ecpg when using an array element.
23082308
- Free all memory in auto-prepare mode.
23092309

2310+
Thu, 14 Feb 2008 13:11:34 +0100
2311+
2312+
- Added SQLSTATE macro closing bug #3961.
23102313

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.12 2006/03/11 04:38:39 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.13 2008/02/14 12:22:36 meskes Exp $ */
22

33
#ifndef_ECPG_DATETIME_H
44
#define_ECPG_DATETIME_H
55

66
#include<ecpg_informix.h>
77

8-
typedeftimestampdtime_t;
9-
typedefintervalintrvl_t;
8+
/*typedef timestamp dtime_t;
9+
typedef interval intrvl_t;*/
1010

1111
#endif/* ndef _ECPG_DATETIME_H */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.14 2006/03/11 04:38:39 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.15 2008/02/14 12:22:36 meskes Exp $ */
22

33
#ifndef_ECPG_DECIMAL_H
44
#define_ECPG_DECIMAL_H
55

66
#include<ecpg_informix.h>
77

8-
typedefdecimaldec_t;
8+
/*typedef decimal dec_t; */
99

1010
#endif/* ndef _ECPG_DECIMAL_H */

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file contains stuff needed to be as compatible to Informix as possible.
3-
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.18 2006/03/11 04:38:39 momjian Exp $
3+
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.19 2008/02/14 12:22:36 meskes Exp $
44
*/
55
#ifndef_ECPG_INFORMIX_H
66
#define_ECPG_INFORMIX_H
@@ -82,6 +82,11 @@ extern intdttofmtasc(timestamp *, char *, int, char *);
8282
externintintoasc(interval*,char*);
8383
externintdtcvfmtasc(char*,char*,timestamp*);
8484

85+
/* we also define Informix datatypes here */
86+
typedeftimestampdtime_t;
87+
typedefintervalintrvl_t;
88+
typedefdecimaldec_t;
89+
8590
#ifdef__cplusplus
8691
}
8792
#endif

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* this is a small part of c.h since we don't want to leak all postgres
33
* definitions into ecpg programs
4-
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.74 2008/01/13 11:53:16 meskes Exp $
4+
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.75 2008/02/14 12:22:36 meskes Exp $
55
*/
66

77
#ifndef_ECPGLIB_H
@@ -58,7 +58,8 @@ voidsqlprint(void);
5858

5959
/* define this for simplicity as well as compatibility */
6060

61-
#defineSQLCODE sqlca.sqlcode
61+
#defineSQLCODEsqlca.sqlcode
62+
#defineSQLSTATE sqlca.sqlstate
6263

6364
/* dynamic SQL */
6465

‎src/interfaces/ecpg/preproc/pgc.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159 2008/01/15 10:31:47 meskes Exp $
15+
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.160 2008/02/14 12:22:36 meskes Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -1320,7 +1320,7 @@ static bool isdefine(void)
13201320

13211321
staticboolisinformixdefine(void)
13221322
{
1323-
constchar *new =NULL;
1323+
/*const char *new = NULL;
13241324
13251325
if (strcmp(yytext, "dec_t") == 0)
13261326
new = "decimal";
@@ -1344,7 +1344,7 @@ static bool isinformixdefine(void)
13441344
yy_scan_string(new);
13451345
return true;
13461346
}
1347-
1347+
*/
13481348
returnfalse;
13491349
}
13501350

0 commit comments

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