Improve COPY syntax to use WITH clause, keep backward compatibility.

Author: bmomjian

doc/src/sgml/keywords.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/keywords.sgml,v 2.5 2002/01/08 15:38:42 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/keywords.sgml,v 2.6 2002/06/20 16:00:43 momjian Exp $ -->
 
 <appendix id="sql-keywords-appendix">
  <title><acronym>SQL</acronym> Key Words</title>
@@ -890,6 +890,12 @@
     <entry>reserved</entry>
     <entry>reserved</entry>
    </row>
+   <row>
+    <entry><token>DELIMITER</token></entry>
+    <entry>non-reserved</entry>
+    <entry></entry>
+    <entry></entry>
+   </row>
    <row>
     <entry><token>DELIMITERS</token></entry>
     <entry>non-reserved</entry>

doc/src/sgml/ref/copy.sgml

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.156 2002/05/21 22:59:00 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.157 2002/06/20 16:00:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -261,18 +261,79 @@ CopyDonePeek(FILE *fp, int c, bool pickup)
  * the table.
  */
 void
-DoCopy(const RangeVar *relation, bool binary, bool oids, bool from, bool pipe,
-	   char *filename, char *delim, char *null_print)
+DoCopy(const CopyStmt *stmt)
 {
+	RangeVar *relation = stmt->relation;
+	char *filename = stmt->filename;
+	bool is_from = stmt->is_from;
+	bool pipe = (stmt->filename == NULL);
+	List	   *option;
+	DefElem    *dbinary = NULL;
+	DefElem    *doids = NULL;
+	DefElem    *ddelim = NULL;
+	DefElem    *dnull = NULL;
+	bool binary = false;
+	bool oids = false;
+	char *delim = "\t";
+	char *null_print = "\\N";
 	FILE	   *fp;
 	Relation	rel;
-	AclMode		required_access = (from ? ACL_INSERT : ACL_SELECT);
+	AclMode		required_access = (is_from ? ACL_INSERT : ACL_SELECT);
 	AclResult	aclresult;
 
+	/* Extract options from the statement node tree */
+	foreach(option, stmt->options)
+	{
+		DefElem    *defel = (DefElem *) lfirst(option);
+
+		if (strcmp(defel->defname, "binary") == 0)
+		{
+			if (dbinary)
+				elog(ERROR, "COPY: conflicting options");
+			dbinary = defel;
+		}
+		else if (strcmp(defel->defname, "oids") == 0)
+		{
+			if (doids)
+				elog(ERROR, "COPY: conflicting options");
+			doids = defel;
+		}
+		else if (strcmp(defel->defname, "delimiter") == 0)
+		{
+			if (ddelim)
+				elog(ERROR, "COPY: conflicting options");
+			ddelim = defel;
+		}
+		else if (strcmp(defel->defname, "null") == 0)
+		{
+			if (dnull)
+				elog(ERROR, "COPY: conflicting options");
+			dnull = defel;
+		}
+		else
+			elog(ERROR, "COPY: option \"%s\" not recognized",
+				 defel->defname);
+	}
+
+	if (dbinary)
+		binary = intVal(dbinary->arg);
+	if (doids)
+		oids = intVal(doids->arg);
+	if (ddelim)
+		delim = strVal(ddelim->arg);
+	if (dnull)
+		null_print = strVal(dnull->arg);
+
+	if (binary && ddelim)
+		elog(ERROR, "You can not specify the DELIMITER in BINARY mode.");
+
+	if (binary && dnull)
+		elog(ERROR, "You can not specify NULL in BINARY mode.");
+	
 	/*
 	 * Open and lock the relation, using the appropriate lock type.
 	 */
-	rel = heap_openrv(relation, (from ? RowExclusiveLock : AccessShareLock));
+	rel = heap_openrv(relation, (is_from ? RowExclusiveLock : AccessShareLock));
 
 	/* Check permissions. */
 	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
@@ -306,7 +367,7 @@ DoCopy(const RangeVar *relation, bool binary, bool oids, bool from, bool pipe,
 	server_encoding = GetDatabaseEncoding();
 #endif
 
-	if (from)
+	if (is_from)
 	{							/* copy from file to database */
 		if (rel->rd_rel->relkind != RELKIND_RELATION)
 		{
@@ -410,7 +471,7 @@ DoCopy(const RangeVar *relation, bool binary, bool oids, bool from, bool pipe,
 
 	if (!pipe)
 		FreeFile(fp);
-	else if (!from)
+	else if (!is_from)
 	{
 		if (!binary)
 			CopySendData("\\.\n", 3, fp);
@@ -425,7 +486,7 @@ DoCopy(const RangeVar *relation, bool binary, bool oids, bool from, bool pipe,
 	 * transaction to ensure that updates will be committed before lock is
 	 * released.
 	 */
-	heap_close(rel, (from ? NoLock : AccessShareLock));
+	heap_close(rel, (is_from ? NoLock : AccessShareLock));
 }
 
 

doc/src/sgml/ref/psql-ref.sgml

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.93 2002/06/18 17:27:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.94 2002/06/20 16:00:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,7 @@ static bool remove_dbdirs(const char *real_loc, const char *altloc);
  */
 
 void
-createdb(CreatedbStmt *stmt)
+createdb(const CreatedbStmt *stmt)
 {
 	char	   *nominal_loc;
 	char	   *alt_loc;

src/backend/commands/copy.c

@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.189 2002/06/18 17:27:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.190 2002/06/20 16:00:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1992,16 +1992,11 @@ _copyCopyStmt(CopyStmt *from)
 {
 	CopyStmt   *newnode = makeNode(CopyStmt);
 
-	newnode->binary = from->binary;
 	Node_Copy(from, newnode, relation);
-	newnode->oids = from->oids;
-	newnode->direction = from->direction;
+	newnode->is_from = from->is_from;
 	if (from->filename)
 		newnode->filename = pstrdup(from->filename);
-	if (from->delimiter)
-		newnode->delimiter = pstrdup(from->delimiter);
-	if (from->null_print)
-		newnode->null_print = pstrdup(from->null_print);
+	Node_Copy(from, newnode, options);
 
 	return newnode;
 }

src/backend/commands/dbcommands.c

@@ -20,7 +20,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.136 2002/06/18 17:27:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.137 2002/06/20 16:00:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -799,19 +799,13 @@ _equalClusterStmt(ClusterStmt *a, ClusterStmt *b)
 static bool
 _equalCopyStmt(CopyStmt *a, CopyStmt *b)
 {
-	if (a->binary != b->binary)
-		return false;
 	if (!equal(a->relation, b->relation))
 		return false;
-	if (a->oids != b->oids)
-		return false;
-	if (a->direction != b->direction)
+	if (a->is_from != b->is_from)
 		return false;
 	if (!equalstr(a->filename, b->filename))
 		return false;
-	if (!equalstr(a->delimiter, b->delimiter))
-		return false;
-	if (!equalstr(a->null_print, b->null_print))
+	if (!equal(a->options, b->options))
 		return false;
 
 	return true;