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

Commit4b02f3c

Browse files
author
Michael Meskes
committed
Synced parser and fixed a bug in error output to log file.
1 parent048cb1c commit4b02f3c

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,10 @@ Fri Aug 1 08:54:02 CEST 2003
16001600

16011601
- Added some Informix error codes in Informix mode.
16021602
- Added just another pgtypeslib function.
1603+
1604+
Mon Aug 25 13:24:27 CEST 2003
1605+
1606+
- Synced parser.
16031607
- Set ecpg version to 3.0.0
16041608
- Set ecpg library to 4.0.0
16051609
- Set pgtypes library to 1.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.8 2003/08/24 18:36:38 petere Exp $ */
1+
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.9 2003/08/25 13:43:58 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -192,7 +192,7 @@ ECPGraise_backend(int line, PGresult *result, PGconn *conn, int compat)
192192
sqlca->sqlcode=ECPG_PGSQL;
193193

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

197197
/* free all memory we have allocated for the user */
198198
ECPGfree_auto_mem();

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.251 2003/08/06 15:54:06 tgl Exp $*/
1+
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.252 2003/08/25 13:44:00 meskes Exp $*/
22

33
/* Copyright comment*/
44
%{
@@ -420,7 +420,7 @@ adjust_informix(struct arguments *list)
420420
%type<str>row_descriptorConstDatetimeAlterDomainStmtAlterSeqStmt
421421
%type<str>SelectStmtinto_clauseOptTempConstraintAttributeSpec
422422
%type<str>opt_tableopt_allsort_clausesortby_listConstraintAttr
423-
%type<str>sortbyOptUseOpqualified_name_listname_listColId_or_Sconst
423+
%type<str>sortbyqualified_name_listname_listColId_or_Sconst
424424
%type<str>group_clausehaving_clausefrom_clauseopt_distinctopt_hold
425425
%type<str>join_outerwhere_clauserelation_exprsub_typeopt_arg
426426
%type<str>opt_column_listinsert_restInsertStmt
@@ -2887,14 +2887,14 @@ sortby_list: sortby{ $$ = $1; }
28872887
|sortby_list','sortby{$$ = cat_str(3,$1, make_str(","),$3); }
28882888
;
28892889

2890-
sortby:a_exprOptUseOp
2891-
{$$ =cat2_str($1,$2); }
2892-
;
2893-
2894-
OptUseOp:USINGall_Op{$$ = cat2_str(make_str("using"),$2); }
2895-
|ASC{$$ = make_str("asc"); }
2896-
|DESC{$$ = make_str("desc"); }
2897-
|/*EMPTY*/{$$ =EMPTY; }
2890+
sortby:a_exprUSINGqual_all_Op
2891+
{$$ =cat_str(3,$1,make_str("using"),$3); }
2892+
|a_exprASC
2893+
{$$ = cat2_str($1, make_str("asc")); }
2894+
|a_exprDESC
2895+
{$$ =cat2_str($1,make_str("desc")); }
2896+
|a_expr
2897+
{$$ =$1; }
28982898
;
28992899

29002900
select_limit:LIMITselect_limit_valueOFFSETselect_offset_value

0 commit comments

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