Fixes:
Previously Postgres95 wouldn't accept 'order by' clauses with fields referred to as '<table>.<field>', e.g.: select t1.field1, t2.field2 from table1 t1, table2 t2 order by t2.field2; This syntax is required by the ODBC SQL spec. Submitted by: Dan McGuirk <mcguirk@indirect.com>
This commit is contained in:
parent
ab22b34891
commit
6c684b1847
|
@ -6,7 +6,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (c) 1994, Regents of the University of California
|
* Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: parsenodes.h,v 1.2 1996/08/06 16:27:48 scrappy Exp $
|
* $Id: parsenodes.h,v 1.3 1996/08/06 16:37:53 scrappy Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -631,6 +631,7 @@ typedef struct RelExpr {
|
||||||
*/
|
*/
|
||||||
typedef struct SortBy {
|
typedef struct SortBy {
|
||||||
NodeTag type;
|
NodeTag type;
|
||||||
|
char *range;
|
||||||
char *name; /* name of column to sort on */
|
char *name; /* name of column to sort on */
|
||||||
char *useOp; /* operator to use */
|
char *useOp; /* operator to use */
|
||||||
} SortBy;
|
} SortBy;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.4 1996/08/06 16:27:56 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.5 1996/08/06 16:37:58 scrappy Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -62,7 +62,8 @@ static TargetEntry *make_targetlist_expr(ParseState *pstate,
|
||||||
bool ResdomNoIsAttrNo);
|
bool ResdomNoIsAttrNo);
|
||||||
static Node *transformWhereClause(ParseState *pstate, Node *a_expr);
|
static Node *transformWhereClause(ParseState *pstate, Node *a_expr);
|
||||||
static List *transformGroupClause(ParseState *pstate, List *grouplist);
|
static List *transformGroupClause(ParseState *pstate, List *grouplist);
|
||||||
static List *transformSortClause(List *orderlist, List *targetlist,
|
static List *transformSortClause(ParseState *pstate,
|
||||||
|
List *orderlist, List *targetlist,
|
||||||
char* uniqueFlag);
|
char* uniqueFlag);
|
||||||
|
|
||||||
static void parseFromClause(ParseState *pstate, List *frmList);
|
static void parseFromClause(ParseState *pstate, List *frmList);
|
||||||
|
@ -418,7 +419,8 @@ transformSelectStmt(ParseState *pstate, RetrieveStmt *stmt)
|
||||||
qry->qual = transformWhereClause(pstate,stmt->whereClause);
|
qry->qual = transformWhereClause(pstate,stmt->whereClause);
|
||||||
|
|
||||||
/* fix order clause */
|
/* fix order clause */
|
||||||
qry->sortClause = transformSortClause(stmt->orderClause,
|
qry->sortClause = transformSortClause(pstate,
|
||||||
|
stmt->orderClause,
|
||||||
qry->targetList,
|
qry->targetList,
|
||||||
qry->uniqueFlag);
|
qry->uniqueFlag);
|
||||||
|
|
||||||
|
@ -506,7 +508,8 @@ transformCursorStmt(ParseState *pstate, CursorStmt *stmt)
|
||||||
qry->qual = transformWhereClause(pstate,stmt->whereClause);
|
qry->qual = transformWhereClause(pstate,stmt->whereClause);
|
||||||
|
|
||||||
/* fix order clause */
|
/* fix order clause */
|
||||||
qry->sortClause = transformSortClause(stmt->orderClause,
|
qry->sortClause = transformSortClause(pstate,
|
||||||
|
stmt->orderClause,
|
||||||
qry->targetList,
|
qry->targetList,
|
||||||
qry->uniqueFlag);
|
qry->uniqueFlag);
|
||||||
/* fix group by clause */
|
/* fix group by clause */
|
||||||
|
@ -1512,21 +1515,36 @@ transformWhereClause(ParseState *pstate, Node *a_expr)
|
||||||
/*
|
/*
|
||||||
* find_tl_elt -
|
* find_tl_elt -
|
||||||
* returns the Resdom in the target list matching the specified varname
|
* returns the Resdom in the target list matching the specified varname
|
||||||
|
* and range
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
static Resdom *
|
static Resdom *
|
||||||
find_tl_elt(char *varname, List *tlist)
|
find_tl_elt(ParseState *pstate, char *range, char *varname, List *tlist)
|
||||||
{
|
{
|
||||||
List *i;
|
List *i;
|
||||||
|
int real_rtable_pos;
|
||||||
|
|
||||||
|
if(range) {
|
||||||
|
real_rtable_pos = RangeTablePosn(pstate->p_rtable, range);
|
||||||
|
}
|
||||||
|
|
||||||
foreach(i, tlist) {
|
foreach(i, tlist) {
|
||||||
TargetEntry *target = (TargetEntry *)lfirst(i);
|
TargetEntry *target = (TargetEntry *)lfirst(i);
|
||||||
Resdom *resnode = target->resdom;
|
Resdom *resnode = target->resdom;
|
||||||
|
Var *var = (Var *)target->expr;
|
||||||
char *resname = resnode->resname;
|
char *resname = resnode->resname;
|
||||||
|
int test_rtable_pos = var->varno;
|
||||||
|
|
||||||
if (!strcmp(resname, varname))
|
if (!strcmp(resname, varname)) {
|
||||||
|
if(range) {
|
||||||
|
if(real_rtable_pos == test_rtable_pos) {
|
||||||
return (resnode);
|
return (resnode);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return (resnode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return ((Resdom *)NULL);
|
return ((Resdom *)NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1579,7 +1597,8 @@ transformGroupClause(ParseState *pstate, List *grouplist)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
static List *
|
static List *
|
||||||
transformSortClause(List *orderlist, List *targetlist,
|
transformSortClause(ParseState *pstate,
|
||||||
|
List *orderlist, List *targetlist,
|
||||||
char* uniqueFlag)
|
char* uniqueFlag)
|
||||||
{
|
{
|
||||||
List *sortlist = NIL;
|
List *sortlist = NIL;
|
||||||
|
@ -1590,7 +1609,7 @@ transformSortClause(List *orderlist, List *targetlist,
|
||||||
SortClause *sortcl = makeNode(SortClause);
|
SortClause *sortcl = makeNode(SortClause);
|
||||||
Resdom *resdom;
|
Resdom *resdom;
|
||||||
|
|
||||||
resdom = find_tl_elt(sortby->name, targetlist);
|
resdom = find_tl_elt(pstate, sortby->range, sortby->name, targetlist);
|
||||||
if (resdom == NULL)
|
if (resdom == NULL)
|
||||||
elog(WARN,"The field being sorted by must appear in the target list");
|
elog(WARN,"The field being sorted by must appear in the target list");
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.3 1996/08/06 16:27:59 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.4 1996/08/06 16:38:03 scrappy Exp $
|
||||||
*
|
*
|
||||||
* HISTORY
|
* HISTORY
|
||||||
* AUTHOR DATE MAJOR EVENT
|
* AUTHOR DATE MAJOR EVENT
|
||||||
|
@ -1426,12 +1426,20 @@ sortby_list: sortby
|
||||||
sortby: Id OptUseOp
|
sortby: Id OptUseOp
|
||||||
{
|
{
|
||||||
$$ = makeNode(SortBy);
|
$$ = makeNode(SortBy);
|
||||||
|
$$->range = NULL;
|
||||||
$$->name = $1;
|
$$->name = $1;
|
||||||
$$->useOp = $2;
|
$$->useOp = $2;
|
||||||
}
|
}
|
||||||
| attr OptUseOp
|
| Id '.' Id OptUseOp
|
||||||
{
|
{
|
||||||
yyerror("parse error: use 'sort by attribute_name'");
|
$$ = makeNode(SortBy);
|
||||||
|
$$->range = $1;
|
||||||
|
$$->name = $3;
|
||||||
|
$$->useOp = $4;
|
||||||
|
}
|
||||||
|
| /*EMPTY*/
|
||||||
|
{
|
||||||
|
yyerror("parse error: use 'order by attribute_name'");
|
||||||
}
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue