Pass modern COPY syntax to backend, since copy (query) does not accept old syntax...

diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index 5258382ef7a55737a1de3d0da47e14aa40259bcb..4f2023760afb159b598810a1deaf39f5fa251de6 100644 (file)
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -268,7 +268,7 @@ parse_slash_copy(const char *args)
                                        0, false, false, pset.encoding);
 
        /*
-        * Allows old COPY syntax for backward compatibility 2002-06-19
+        * Allows old COPY syntax for backward compatibility.
         */
        if (token && pg_strcasecmp(token, "using") == 0)
        {
@@ -480,32 +480,28 @@ do_copy(const char *args)
 
        printfPQExpBuffer(&query, "COPY ");
 
-       /* Uses old COPY syntax for backward compatibility 2002-06-19 */
-       if (options->binary)
-               appendPQExpBuffer(&query, "BINARY ");
-
        appendPQExpBuffer(&query, "%s ", options->table);
 
        if (options->column_list)
                appendPQExpBuffer(&query, "%s ", options->column_list);
 
-       /* Uses old COPY syntax for backward compatibility 2002-06-19 */
-       if (options->oids)
-               appendPQExpBuffer(&query, "WITH OIDS ");
-
        if (options->from)
                appendPQExpBuffer(&query, "FROM STDIN");
        else
                appendPQExpBuffer(&query, "TO STDOUT");
 
 
-       /* Uses old COPY syntax for backward compatibility 2002-06-19 */
+       if (options->binary)
+               appendPQExpBuffer(&query, " BINARY ");
+
+       if (options->oids)
+               appendPQExpBuffer(&query, " OIDS ");
+
        if (options->delim)
-               emit_copy_option(&query, " USING DELIMITERS ", options->delim);
+               emit_copy_option(&query, " DELIMITER ", options->delim);
 
-       /* There is no backward-compatible CSV syntax */
        if (options->null)
-               emit_copy_option(&query, " WITH NULL AS ", options->null);
+               emit_copy_option(&query, " NULL AS ", options->null);
 
        if (options->csv_mode)
                appendPQExpBuffer(&query, " CSV");