Commit 660f458d authored by Bruce Momjian's avatar Bruce Momjian

Clean up of copyfuncs.

parent f3dbe735
This diff is collapsed.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.89 1998/01/11 03:41:38 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.90 1998/01/11 20:01:59 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -1960,6 +1960,8 @@ ViewStmt: CREATE VIEW name AS SelectStmt ...@@ -1960,6 +1960,8 @@ ViewStmt: CREATE VIEW name AS SelectStmt
ViewStmt *n = makeNode(ViewStmt); ViewStmt *n = makeNode(ViewStmt);
n->viewname = $3; n->viewname = $3;
n->query = (Query *)$5; n->query = (Query *)$5;
if (((SelectStmt *)n->query)->sortClause != NULL)
elog(ERROR,"Order by and Distinct on views is not implemented.");
if (((SelectStmt *)n->query)->unionClause != NULL) if (((SelectStmt *)n->query)->unionClause != NULL)
elog(ERROR,"Views on unions not implemented."); elog(ERROR,"Views on unions not implemented.");
$$ = (Node *)n; $$ = (Node *)n;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: psqlHelp.h,v 1.37 1998/01/11 04:36:25 momjian Exp $ * $Id: psqlHelp.h,v 1.38 1998/01/11 20:02:15 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -150,7 +150,8 @@ static struct _helpStruct QL_HELP[] = { ...@@ -150,7 +150,8 @@ static struct _helpStruct QL_HELP[] = {
{"create view", {"create view",
"create a view", "create a view",
"create view <view_name> as\n\ "create view <view_name> as\n\
\tselect <expr1>[as <attr1>][,... <exprN>[as <attrN>]]\n\ \tselect\n\
\t<expr1>[as <attr1>][,... <exprN>[as <attrN>]]\n\
\t[from <from_list>]\n\ \t[from <from_list>]\n\
\t[where <qual>]\n\ \t[where <qual>]\n\
\t[group by <group_list>];"}, \t[group by <group_list>];"},
...@@ -159,8 +160,11 @@ static struct _helpStruct QL_HELP[] = { ...@@ -159,8 +160,11 @@ static struct _helpStruct QL_HELP[] = {
"declare <cursorname> [binary] cursor for\n\ "declare <cursorname> [binary] cursor for\n\
\tselect [distinct]\n\ \tselect [distinct]\n\
\t<expr1> [as <attr1>],...<exprN> [as <attrN>]\n\ \t<expr1> [as <attr1>],...<exprN> [as <attrN>]\n\
\t[from <from_list>] [where <qual>]\n\ \t[from <from_list>]\n\
\t[order by <attr1> [using <op1>],... <attrN> [using <opN>]];"}, \t[where <qual>]\n\
\t[group by <group_list>]\n\
\t[order by <attr1> [using <op1>],... <attrN> [using <opN>]]\n\
\t[union [all] select ...];"},
{"delete", {"delete",
"delete tuples", "delete tuples",
"delete from <class_name> [where <qual>];"}, "delete from <class_name> [where <qual>];"},
...@@ -234,7 +238,8 @@ static struct _helpStruct QL_HELP[] = { ...@@ -234,7 +238,8 @@ static struct _helpStruct QL_HELP[] = {
"insert tuples", "insert tuples",
"insert into <class_name> [(<attr1>...<attrN>)]\n\ "insert into <class_name> [(<attr1>...<attrN>)]\n\
\tvalues (<expr1>...<exprN>); |\n\ \tvalues (<expr1>...<exprN>); |\n\
\tselect <expr1>,...<exprN>\n\ \tselect [distinct]\n\
\t<expr1>,...<exprN>\n\
\t[from <from_clause>]\n\ \t[from <from_clause>]\n\
\t[where <qual>]\n\ \t[where <qual>]\n\
\t[group by <group_list>]\n\ \t[group by <group_list>]\n\
......
.\" This is -*-nroff-*- .\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here.... .\" XXX standard disclaimer belongs here....
.\" $Header: /cvsroot/pgsql/src/man/Attic/insert.l,v 1.7 1998/01/11 04:36:28 momjian Exp $ .\" $Header: /cvsroot/pgsql/src/man/Attic/insert.l,v 1.8 1998/01/11 20:02:32 momjian Exp $
.TH INSERT SQL 11/05/95 PostgreSQL PostgreSQL .TH INSERT SQL 11/05/95 PostgreSQL PostgreSQL
.SH NAME .SH NAME
insert \(em insert tuples to a relation insert \(em insert tuples to a relation
...@@ -9,7 +9,8 @@ insert \(em insert tuples to a relation ...@@ -9,7 +9,8 @@ insert \(em insert tuples to a relation
\fBinsert\fR into classname \fBinsert\fR into classname
[(att.expr-1 [,att_expr.i] )] [(att.expr-1 [,att_expr.i] )]
{\fBvalues\fR (expression1 [,expression-i] ) | {\fBvalues\fR (expression1 [,expression-i] ) |
\fBselect\fR expression1 [,expression-i] \fBselect\fR [distinct]
expression1 [,expression-i]
[\fBfrom\fR from-list] [\fBwhere\fR qual] [\fBfrom\fR from-list] [\fBwhere\fR qual]
[\fBgroup by\fR attr_name1 {, attr_name-i....}] [\fBgroup by\fR attr_name1 {, attr_name-i....}]
[\fBunion {all} select\fR ...] [\fBunion {all} select\fR ...]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment