mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Synced preproc.y with gram.y.

Browse Source 
- Changed locale handling.
This commit is contained in:
Michael Meskes 2001-09-25 18:37:17 +00:00
parent 1b20315008
commit 16b9b75876
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/ecpg/ChangeLog
View File

@ -1096,5 +1096,10 @@ Wed Sep 19 15:57:49 CEST 2001
- Synced pgc.l with scan.l. - Synced pgc.l with scan.l.
- Synced keyword.c. - Synced keyword.c.
- Include the remaining patches by Christof Petig <christof.petig@wtal.de>. - Include the remaining patches by Christof Petig <christof.petig@wtal.de>.
Tue Sep 25 20:10:03 CEST 2001
- Synced preproc.y with gram.y.
- Changed locale handling.
- Set ecpg version to 2.9.0. - Set ecpg version to 2.9.0.
- Set library version to 3.3.0. - Set library version to 3.3.0.

8
src/interfaces/ecpg/lib/execute.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.23 2001/09/19 14:09:32 meskes Exp $ */ /* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.24 2001/09/25 18:37:17 meskes Exp $ */
/* /*
* The aim is to get a simpler inteface to the database routines. * The aim is to get a simpler inteface to the database routines.
@ -1007,11 +1007,11 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
struct statement *stmt; struct statement *stmt;
struct connection *con = get_connection(connection_name); struct connection *con = get_connection(connection_name);
bool status = true; bool status = true;
char *locale = setlocale(LC_NUMERIC, NULL); char *locale;
/* Make sure we do NOT honor the locale for numeric input/output */ /* Make sure we do NOT honor the locale for numeric input/output */
/* since the database wants teh standard decimal point */ /* since the database wants the standard decimal point */
setlocale(LC_NUMERIC, "C"); locale = setlocale(LC_NUMERIC, "C");
if (!ecpg_init(con, connection_name, lineno)) if (!ecpg_init(con, connection_name, lineno))
{ {

6
src/interfaces/ecpg/preproc/preproc.y
View File

@ -2333,6 +2333,10 @@ ExplainStmt: EXPLAIN opt_verbose OptimizableStmt
{ {
$$ = cat_str(3, make_str("explain"), $2, $3); $$ = cat_str(3, make_str("explain"), $2, $3);
} }
| EXPLAIN analyze_keyword opt_verbose OptimizableStmt
{
$$ = cat_str(4, make_str("explain"), $2, $3, $4);
}
; ;
@ -2664,7 +2668,7 @@ OptUseOp: USING all_Op { $$ = cat2_str(make_str("using"), $2); }
| /*EMPTY*/ { $$ = EMPTY; } | /*EMPTY*/ { $$ = EMPTY; }
; ;
select_limit: LIMIT select_limit_value ',' select_offset_value select_limit: LIMIT select_offset_value ',' select_limit_value
{ $$ = cat_str(4, make_str("limit"), $2, make_str(","), $4); } { $$ = cat_str(4, make_str("limit"), $2, make_str(","), $4); }
| LIMIT select_limit_value OFFSET select_offset_value | LIMIT select_limit_value OFFSET select_offset_value
{ $$ = cat_str(4, make_str("limit"), $2, make_str("offset"), $4); } { $$ = cat_str(4, make_str("limit"), $2, make_str("offset"), $4); }