Skip to content

Commit 6456810

Browse files
author
Thomas G. Lockhart
committed
Implement column aliases on views "CREATE VIEW name (collist)".
Implement TIME WITH TIME ZONE type (timetz internal type). Remap length() for character strings to CHAR_LENGTH() for SQL92 and to remove the ambiguity with geometric length() functions. Keep length() for character strings for backward compatibility. Shrink stored views by removing internal column name list from visible rte. Implement min(), max() for time and timetz data types. Implement conversion of TIME to INTERVAL. Implement abs(), mod(), fac() for the int8 data type. Rename some math functions to generic names: round(), sqrt(), cbrt(), pow(), etc. Rename NUMERIC power() function to pow(). Fix int2 factorial to calculate result in int4. Enhance the Oracle compatibility function translate() to work with string arguments (from Edwin Ramirez). Modify pg_proc system table to remove OID holes.
1 parent ce543b2 commit 6456810

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1495
-1113
lines changed

‎src/backend/catalog/heap.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.122 2000/02/18 09:28:40 inoue Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.123 2000/03/14 23:06:06 thomas Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1719,8 +1719,10 @@ StoreAttrDefault(Relation rel, AttrNumber attnum, char *adbin,
17191719
*/
17201720
rte = makeNode(RangeTblEntry);
17211721
rte->relname = RelationGetRelationName(rel);
1722+
#ifndef DISABLE_EREF
17221723
rte->ref = makeNode(Attr);
17231724
rte->ref->relname = RelationGetRelationName(rel);
1725+
#endif
17241726
rte->relid = RelationGetRelid(rel);
17251727
rte->inh = false;
17261728
rte->inFromCl = true;
@@ -1799,8 +1801,10 @@ StoreRelCheck(Relation rel, char *ccname, char *ccbin)
17991801
*/
18001802
rte = makeNode(RangeTblEntry);
18011803
rte->relname = RelationGetRelationName(rel);
1804+
#ifndef DISABLE_EREF
18021805
rte->ref = makeNode(Attr);
18031806
rte->ref->relname = RelationGetRelationName(rel);
1807+
#endif
18041808
rte->relid = RelationGetRelid(rel);
18051809
rte->inh = false;
18061810
rte->inFromCl = true;

‎src/backend/commands/explain.c

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
66
* Portions Copyright (c) 1994-5, Regents of the University of California
77
*
8-
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.54 2000/02/15 20:49:08 tgl Exp $
8+
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.55 2000/03/14 23:06:12 thomas Exp $
99
*
1010
*/
1111

@@ -232,9 +232,33 @@ explain_outNode(StringInfo str, Plan *plan, int indent, ExplainState *es)
232232

233233
appendStringInfo(str, " on %s",
234234
stringStringInfo(rte->relname));
235-
if (rte->ref && strcmp(rte->ref->relname, rte->relname) != 0)
236-
appendStringInfo(str, " %s",
237-
stringStringInfo(rte->ref->relname));
235+
if (rte->ref != NULL)
236+
{
237+
if ((strcmp(rte->ref->relname, rte->relname) != 0)
238+
|| (length(rte->ref->attrs) > 0))
239+
{
240+
appendStringInfo(str, " %s",
241+
stringStringInfo(rte->ref->relname));
242+
243+
if (length(rte->ref->attrs) > 0)
244+
{
245+
List *c;
246+
int firstEntry = true;
247+
248+
appendStringInfo(str, " (");
249+
foreach (c, rte->ref->attrs)
250+
{
251+
if (! firstEntry)
252+
{
253+
appendStringInfo(str, ", ");
254+
firstEntry = false;
255+
}
256+
appendStringInfo(str, "%s", strVal(lfirst(c)));
257+
}
258+
appendStringInfo(str, ")");
259+
}
260+
}
261+
}
238262
}
239263
break;
240264
default:

‎src/backend/nodes/copyfuncs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.108 2000/02/21 18:47:00 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.109 2000/03/14 23:06:27 thomas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1366,6 +1366,7 @@ _copyRangeTblEntry(RangeTblEntry *from)
13661366
if (from->relname)
13671367
newnode->relname = pstrdup(from->relname);
13681368
Node_Copy(from, newnode, ref);
1369+
Node_Copy(from, newnode, eref);
13691370
newnode->relid = from->relid;
13701371
newnode->inh = from->inh;
13711372
newnode->inFromCl = from->inFromCl;

‎src/backend/nodes/freefuncs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.38 2000/02/21 18:47:00 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.39 2000/03/14 23:06:28 thomas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1031,6 +1031,7 @@ _freeRangeTblEntry(RangeTblEntry *node)
10311031
if (node->relname)
10321032
pfree(node->relname);
10331033
freeObject(node->ref);
1034+
freeObject(node->eref);
10341035

10351036
pfree(node);
10361037
}

‎src/backend/optimizer/prep/prepunion.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.45 2000/02/15 20:49:19 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.46 2000/03/14 23:06:29 thomas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -454,8 +454,8 @@ new_rangetable_entry(Oid new_relid, RangeTblEntry *old_entry)
454454
RangeTblEntry *new_entry = copyObject(old_entry);
455455

456456
/* ??? someone tell me what the following is doing! - ay 11/94 */
457-
if (!strcmp(new_entry->ref->relname, "*CURRENT*") ||
458-
!strcmp(new_entry->ref->relname, "*NEW*"))
457+
if (!strcmp(new_entry->eref->relname, "*CURRENT*") ||
458+
!strcmp(new_entry->eref->relname, "*NEW*"))
459459
new_entry->ref->relname = get_rel_name(new_relid);
460460
else
461461
new_entry->relname = get_rel_name(new_relid);

‎src/backend/parser/analyze.c

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: analyze.c,v 1.139 2000/03/01 05:18:20 tgl Exp $
9+
* $Id: analyze.c,v 1.140 2000/03/14 23:06:30 thomas Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -146,6 +146,34 @@ transformStmt(ParseState *pstate, Node *parseTree)
146146
ViewStmt *n = (ViewStmt *) parseTree;
147147

148148
n->query = (Query *) transformStmt(pstate, (Node *) n->query);
149+
150+
/* If a list of column names was given, run through and insert these
151+
* into the actual query tree. - thomas 2000-03-08
152+
*/
153+
if (n->aliases != NIL)
154+
{
155+
int i;
156+
List *targetList = n->query->targetList;
157+
158+
if (length(targetList) < length(n->aliases))
159+
elog(ERROR, "CREATE VIEW specifies %d columns"
160+
" but only %d columns are present",
161+
length(targetList), length(n->aliases));
162+
163+
for (i = 0; i < length(n->aliases); i++)
164+
{
165+
Ident *id;
166+
TargetEntry *te;
167+
Resdom *rd;
168+
id = nth(i, n->aliases);
169+
Assert(nodeTag(id) == T_Ident);
170+
te = nth(i, targetList);
171+
Assert(nodeTag(te) == T_TargetEntry);
172+
rd = te->resdom;
173+
Assert(nodeTag(rd) == T_Resdom);
174+
rd->resname = pstrdup(id->name);
175+
}
176+
}
149177
result = makeNode(Query);
150178
result->commandType = CMD_UTILITY;
151179
result->utilityStmt = (Node *) n;
@@ -1904,7 +1932,7 @@ transformForUpdate(Query *qry, List *forUpdate)
19041932
i = 1;
19051933
foreach(l2, qry->rtable)
19061934
{
1907-
if (strcmp(((RangeTblEntry *) lfirst(l2))->ref->relname, relname) == 0)
1935+
if (strcmp(((RangeTblEntry *) lfirst(l2))->eref->relname, relname) == 0)
19081936
{
19091937
List *l3;
19101938

@@ -1925,7 +1953,7 @@ transformForUpdate(Query *qry, List *forUpdate)
19251953
i++;
19261954
}
19271955
if (l2 == NULL)
1928-
elog(ERROR, "FOR UPDATE: relation %s not found in FROM clause",
1956+
elog(ERROR, "FOR UPDATE: relation '%s' not found in FROM clause",
19291957
relname);
19301958
}
19311959

0 commit comments

Comments
 (0)