Skip to content

Commit bea0466

Browse files
author
Michael Meskes
committed
Changed the way symbols are defined in C in INFORMIX mode.
Added SQLSTATE macro closing bug #3961. EXECUTE can return NOT FOUND so it should be checked here too.
1 parent ca65da8 commit bea0466

File tree

7 files changed

+33
-45
lines changed

7 files changed

+33
-45
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,4 +2307,13 @@ 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.
2313+
- EXECUTE can return NOT FOUND so it should be checked here too.
2314+
- Changed regression test accordingly.
2315+
2316+
Fri, 15 Feb 2008 12:01:13 +0100
2317+
2318+
- Changed the way symbols are defined in C in INFORMIX mode.
23102319

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
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.12.4.1 2008/02/15 12:11:02 meskes Exp $ */
22

33
#ifndef _ECPG_DATETIME_H
44
#define _ECPG_DATETIME_H
55

66
#include <ecpg_informix.h>
77

8-
typedef timestamp dtime_t;
9-
typedef interval intrvl_t;
8+
/* brought in by ecpg_informix.h nowadays
9+
* typedef timestamp dtime_t;
10+
* typedef interval intrvl_t; */
1011

1112
#endif /* ndef _ECPG_DATETIME_H */

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
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.14.4.1 2008/02/15 12:11:02 meskes Exp $ */
22

33
#ifndef _ECPG_DECIMAL_H
44
#define _ECPG_DECIMAL_H
55

66
#include <ecpg_informix.h>
77

8-
typedef decimal dec_t;
8+
/* brought in by ecpg_informix.h nowadays
9+
* typedef decimal dec_t; */
910

1011
#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.18.4.1 2008/02/15 12:11:02 meskes Exp $
44
*/
55
#ifndef _ECPG_INFORMIX_H
66
#define _ECPG_INFORMIX_H
@@ -82,6 +82,11 @@ extern int dttofmtasc(timestamp *, char *, int, char *);
8282
extern int intoasc(interval *, char *);
8383
extern int dtcvfmtasc(char *, char *, timestamp *);
8484

85+
/* we also define Informix datatypes here */
86+
typedef timestamp dtime_t;
87+
typedef interval intrvl_t;
88+
typedef decimal dec_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.74.2.1 2008/02/15 12:11:02 meskes Exp $
55
*/
66

77
#ifndef _ECPGLIB_H
@@ -58,7 +58,8 @@ void sqlprint(void);
5858

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

61-
#define SQLCODE sqlca.sqlcode
61+
#define SQLCODE sqlca.sqlcode
62+
#define SQLSTATE sqlca.sqlstate
6263

6364
/* dynamic SQL */
6465

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

Lines changed: 6 additions & 35 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.159.2.1 2008/02/15 12:11:02 meskes Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -47,7 +47,6 @@ static void addlitchar (unsigned char);
4747
static void parse_include (void);
4848
static bool ecpg_isspace(char ch);
4949
static bool isdefine(void);
50-
static bool isinformixdefine(void);
5150

5251
char *token_start;
5352
int state_before;
@@ -744,9 +743,11 @@ cppline {space}*#(.*\\{space})*.*{newline}
744743
<C>{identifier} {
745744
const ScanKeyword *keyword;
746745

747-
/* Informix uses SQL defines only in SQL space */
748-
/* however, some defines have to be taken care of for compatibility */
749-
if ((!INFORMIX_MODE || !isinformixdefine()) && !isdefine())
746+
<<<<<<< pgc.l
747+
if (!INFORMIX_MODE && !isdefine())
748+
=======
749+
if (!isdefine())
750+
>>>>>>> 1.162
750751
{
751752
keyword = ScanCKeywordLookup(yytext);
752753
if (keyword != NULL)
@@ -1318,36 +1319,6 @@ static bool isdefine(void)
13181319
return false;
13191320
}
13201321

1321-
static bool isinformixdefine(void)
1322-
{
1323-
const char *new = NULL;
1324-
1325-
if (strcmp(yytext, "dec_t") == 0)
1326-
new = "decimal";
1327-
else if (strcmp(yytext, "intrvl_t") == 0)
1328-
new = "interval";
1329-
else if (strcmp(yytext, "dtime_t") == 0)
1330-
new = "timestamp";
1331-
1332-
if (new)
1333-
{
1334-
struct _yy_buffer *yb;
1335-
1336-
yb = mm_alloc(sizeof(struct _yy_buffer));
1337-
1338-
yb->buffer = YY_CURRENT_BUFFER;
1339-
yb->lineno = yylineno;
1340-
yb->filename = mm_strdup(input_filename);
1341-
yb->next = yy_buffer;
1342-
yy_buffer = yb;
1343-
1344-
yy_scan_string(new);
1345-
return true;
1346-
}
1347-
1348-
return false;
1349-
}
1350-
13511322
/*
13521323
* Called before any actual parsing is done
13531324
*/

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.359 2008/01/15 10:31:47 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.359.2.1 2008/02/15 12:11:02 meskes Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -807,7 +807,7 @@ stmt: AlterDatabaseStmt { output_statement($1, 0, ECPGst_normal); }
807807
| DropUserStmt { output_statement($1, 0, ECPGst_normal); }
808808
| DropdbStmt { output_statement($1, 0, ECPGst_normal); }
809809
| ExplainStmt { output_statement($1, 0, ECPGst_normal); }
810-
| ExecuteStmt { output_statement($1, 0, ECPGst_execute); }
810+
| ExecuteStmt { output_statement($1, 1, ECPGst_execute); }
811811
| FetchStmt { output_statement($1, 1, ECPGst_normal); }
812812
| GrantStmt { output_statement($1, 0, ECPGst_normal); }
813813
| GrantRoleStmt { output_statement($1, 0, ECPGst_normal); }

0 commit comments

Comments
 (0)