*** pgsql/src/test/regress/expected/copy2.out	2009/07/25 00:07:14	1.27
--- pgsql/src/test/regress/expected/copy2.out	2009/09/21 20:10:21	1.28
*************** COPY y TO stdout WITH CSV FORCE QUOTE *;
*** 195,200 ****
--- 195,233 ----
  "Jackson, Sam","\h"
  "It is ""perfect"".","	"
  "",
+ -- Repeat above tests with new 8.5 option syntax
+ COPY y TO stdout (FORMAT CSV);
+ "Jackson, Sam",\h
+ "It is ""perfect"".",	
+ "",
+ COPY y TO stdout (FORMAT CSV, QUOTE '''', DELIMITER '|');
+ Jackson, Sam|\h
+ It is "perfect".|	
+ ''|
+ COPY y TO stdout (FORMAT CSV, FORCE_QUOTE (col2), ESCAPE E'\\');
+ "Jackson, Sam","\\h"
+ "It is \"perfect\".","	"
+ "",
+ COPY y TO stdout (FORMAT CSV, FORCE_QUOTE *);
+ "Jackson, Sam","\h"
+ "It is ""perfect"".","	"
+ "",
+ \copy y TO stdout (FORMAT CSV)
+ "Jackson, Sam",\h
+ "It is ""perfect"".",	
+ "",
+ \copy y TO stdout (FORMAT CSV, QUOTE '''', DELIMITER '|')
+ Jackson, Sam|\h
+ It is "perfect".|	
+ ''|
+ \copy y TO stdout (FORMAT CSV, FORCE_QUOTE (col2), ESCAPE E'\\')
+ "Jackson, Sam","\\h"
+ "It is \"perfect\".","	"
+ "",
+ \copy y TO stdout (FORMAT CSV, FORCE_QUOTE *)
+ "Jackson, Sam","\h"
+ "It is ""perfect"".","	"
+ "",
  --test that we read consecutive LFs properly
  CREATE TEMP TABLE testnl (a int, b text, c int);
  COPY testnl FROM stdin CSV;