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

Commit1fa6be6

Browse files
author
Michael Meskes
committed
ynced parser and keyword list.
Implemented EXEC SQL UNDEF.Applied first version of the regression test patch by Joachim Wieland <joe@mcknight.de>.
1 parent97eefd6 commit1fa6be6

File tree

9 files changed

+251
-130
lines changed

9 files changed

+251
-130
lines changed

‎src/interfaces/ecpg/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,5 +2052,17 @@ Fr Jul 28 11:00:51 CEST 2006
20522052
- COPY TO STDOUT works
20532053
- Connection identifier has to be unique
20542054
- Variables should be free'ed only once.
2055+
2056+
Tu Aug 1 15:04:52 CEST 2006
2057+
2058+
- Applied patch by Joachim Wieland <joe@mcknight.de> to fix segfault
2059+
occuring when using --enable-thread-safety.
2060+
2061+
We Aug 2 13:15:25 CEST 2006
2062+
2063+
- Synced parser and keyword list.
2064+
- Implemented EXEC SQL UNDEF.
2065+
- Applied first version of the regression test patch by Joachim
2066+
Wieland <joe@mcknight.de>.
20552067
- Set ecpg library version to 5.2.
20562068
- Set ecpg version to 4.2.1.

‎src/interfaces/ecpg/ecpglib/connect.c‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.31 2006/07/28 10:10:42 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.32 2006/08/02 13:43:22 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -26,6 +26,11 @@ ecpg_actual_connection_init(void)
2626
{
2727
pthread_key_create(&actual_connection_key,NULL);
2828
}
29+
30+
voidecpg_pthreads_init(void)
31+
{
32+
pthread_once(&actual_connection_key_once,ecpg_actual_connection_init);
33+
}
2934
#endif
3035

3136
staticstructconnection*
@@ -43,13 +48,10 @@ ecpg_get_connection_nr(const char *connection_name)
4348
* connection and hope the user knows what they're doing (i.e. using
4449
* their own mutex to protect that connection from concurrent accesses
4550
*/
51+
/* if !ret then we got the connection from TSD */
4652
if (NULL==ret)
47-
{
48-
ECPGlog("no TSD connection, going for global\n");
53+
/* no TSD connection, going for global */
4954
ret=actual_connection;
50-
}
51-
else
52-
ECPGlog("got the TSD connection\n");
5355
#else
5456
ret=actual_connection;
5557
#endif
@@ -84,13 +86,10 @@ ECPGget_connection(const char *connection_name)
8486
* connection and hope the user knows what they're doing (i.e. using
8587
* their own mutex to protect that connection from concurrent accesses
8688
*/
89+
/* if !ret then we got the connection from TSD */
8790
if (NULL==ret)
88-
{
89-
ECPGlog("no TSD connection here either, using global\n");
91+
/* no TSD connection here either, using global */
9092
ret=actual_connection;
91-
}
92-
else
93-
ECPGlog("got TSD connection\n");
9493
#else
9594
ret=actual_connection;
9695
#endif
@@ -298,6 +297,10 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
298297
if (dbname==NULL&&connection_name==NULL)
299298
connection_name="DEFAULT";
300299

300+
#ifENABLE_THREAD_SAFETY
301+
ecpg_pthreads_init();
302+
#endif
303+
301304
/* check if the identifier is unique */
302305
if (ECPGget_connection(connection_name))
303306
{
@@ -450,7 +453,6 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
450453

451454
all_connections=this;
452455
#ifdefENABLE_THREAD_SAFETY
453-
pthread_once(&actual_connection_key_once,ecpg_actual_connection_init);
454456
pthread_setspecific(actual_connection_key,all_connections);
455457
#endif
456458
actual_connection=all_connections;

‎src/interfaces/ecpg/ecpglib/error.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.13 2006/07/14 05:28:28 tgl Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.14 2006/08/02 13:43:23 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -189,8 +189,8 @@ ECPGraise_backend(int line, PGresult *result, PGconn *conn, int compat)
189189
else
190190
sqlca->sqlcode=ECPG_PGSQL;
191191

192-
ECPGlog("raising sqlstate %.*s in line %d, '%s'.\n",
193-
sizeof(sqlca->sqlstate),sqlca->sqlstate,line,sqlca->sqlerrm.sqlerrmc);
192+
ECPGlog("raising sqlstate %.*s(sqlcode: %d)in line %d, '%s'.\n",
193+
sizeof(sqlca->sqlstate),sqlca->sqlstate,sqlca->sqlcode,line,sqlca->sqlerrm.sqlerrmc);
194194

195195
/* free all memory we have allocated for the user */
196196
ECPGfree_auto_mem();

‎src/interfaces/ecpg/ecpglib/execute.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.55 2006/07/28 11:49:36 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.56 2006/08/02 13:43:23 meskes Exp $ */
22

33
/*
44
* The aim is to get a simpler inteface to the database routines.
@@ -1465,7 +1465,7 @@ ECPGdo(int lineno, int compat, int force_indicator, const char *connection_name,
14651465
{
14661466
va_listargs;
14671467
structstatement*stmt;
1468-
structconnection*con=ECPGget_connection(connection_name);
1468+
structconnection*con;
14691469
boolstatus;
14701470
char*oldlocale;
14711471

@@ -1474,6 +1474,12 @@ ECPGdo(int lineno, int compat, int force_indicator, const char *connection_name,
14741474
oldlocale=ECPGstrdup(setlocale(LC_NUMERIC,NULL),lineno);
14751475
setlocale(LC_NUMERIC,"C");
14761476

1477+
#ifdefENABLE_THREAD_SAFETY
1478+
ecpg_pthreads_init();
1479+
#endif
1480+
1481+
con=ECPGget_connection(connection_name);
1482+
14771483
if (!ECPGinit(con,connection_name,lineno))
14781484
{
14791485
setlocale(LC_NUMERIC,oldlocale);

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

Lines changed: 5 additions & 1 deletion
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.67 2006/07/11 13:54:25 momjian Exp $
4+
* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.68 2006/08/02 13:43:23 meskes Exp $
55
*/
66

77
#ifndef_ECPGLIB_H
@@ -85,6 +85,10 @@ boolECPGdescribe(int, bool, const char *,...);
8585
/* dynamic result allocation */
8686
voidECPGfree_auto_mem(void);
8787

88+
#ifdefENABLE_THREAD_SAFETY
89+
voidecpg_pthreads_init();
90+
#endif
91+
8892
#ifdef__cplusplus
8993
}
9094
#endif

‎src/interfaces/ecpg/preproc/keywords.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/interfaces/ecpg/preproc/keywords.c,v 1.73 2006/03/05 15:59:08 momjian Exp $
11+
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.74 2006/08/02 13:43:23 meskes Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -167,6 +167,7 @@ static ScanKeyword ScanKeywords[] = {
167167
{"including",INCLUDING},
168168
{"increment",INCREMENT},
169169
{"index",INDEX},
170+
{"indexes",INDEXES},
170171
{"inherit",INHERIT},
171172
{"inherits",INHERITS},
172173
{"initially",INITIALLY},
@@ -324,7 +325,6 @@ static ScanKeyword ScanKeywords[] = {
324325
{"time",TIME},
325326
{"timestamp",TIMESTAMP},
326327
{"to",TO},
327-
{"toast",TOAST},
328328
{"trailing",TRAILING},
329329
{"transaction",TRANSACTION},
330330
{"treat",TREAT},

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

Lines changed: 52 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.147 2006/07/14 05:28:28 tgl Exp $
15+
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.148 2006/08/02 13:43:23 meskes Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -79,7 +79,7 @@ static struct _if_value
7979

8080
%optionyylineno
8181

82-
%sCSQLincldefdef_ident
82+
%sCSQLincldefdef_identundef
8383

8484
/*
8585
* OK, here is a short description of lex/flex rules behavior.
@@ -285,6 +285,7 @@ exec[eE][xX][eE][cC]
285285
sql[sS][qQ][lL]
286286
define[dD][eE][fF][iI][nN][eE]
287287
include [iI][nN][cC][lL][uU][dD][eE]
288+
undef[uU][nN][dD][eE][fF]
288289

289290
ifdef[iI][fF][dD][eE][fF]
290291
ifndef[iI][fF][nN][dD][eE][fF]
@@ -837,7 +838,6 @@ cppline{space}*#(.*\\{space})*.*{newline}
837838
<C>"->*"{return(S_MEMPOINT); }
838839
<C>".*"{return(S_DOTPOINT); }
839840
<C>{other}{return S_ANYTHING; }
840-
841841
<C>{exec_sql}{define}{space}*{BEGIN(def_ident); }
842842
<C>{informix_special}{define}{space}*{
843843
/* are we simulating Informix? */
@@ -851,6 +851,55 @@ cppline{space}*#(.*\\{space})*.*{newline}
851851
return (S_ANYTHING);
852852
}
853853
}
854+
<C>{exec_sql}{undef}{space}*{BEGIN(undef); }
855+
<C>{informix_special}{undef}{space}* {
856+
/* are we simulating Informix? */
857+
if (INFORMIX_MODE)
858+
{
859+
BEGIN(undef);
860+
}
861+
else
862+
{
863+
yyless(1);
864+
return (S_ANYTHING);
865+
}
866+
}
867+
<undef>{identifier}{space}*";" {
868+
struct_defines *ptr, *ptr2 =NULL;
869+
int i;
870+
871+
/*
872+
*Skip the ";" and trailing whitespace. Note that yytext
873+
*contains at least one non-space character plus the ";"
874+
*/
875+
for (i =strlen(yytext)-2;
876+
i >0 &&isspace((unsignedchar) yytext[i]);
877+
i-- )
878+
;
879+
yytext[i+1] ='\0';
880+
881+
882+
for (ptr = defines; ptr !=NULL; ptr2 = ptr, ptr = ptr->next)
883+
{
884+
if (strcmp(yytext, ptr->old) ==0)
885+
{
886+
if (ptr2 ==NULL)
887+
defines = ptr->next;
888+
else
889+
ptr2->next = ptr->next;
890+
free(ptr->new);
891+
free(ptr->old);
892+
free(ptr);
893+
break;
894+
}
895+
}
896+
897+
BEGIN(C);
898+
}
899+
<undef>{other} {
900+
mmerror(PARSE_ERROR, ET_FATAL,"Missing identifier in 'EXEC SQL UNDEF' command");
901+
yyterminate();
902+
}
854903
<C>{exec_sql}{include}{space}*{BEGIN(incl); }
855904
<C>{informix_special}{include}{space}* {
856905
/* are we simulating Informix? */

0 commit comments

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