FROM/TO [WITH options]
! *
! * BINARY, OIDS, and DELIMITERS kept in old locations
! * for backward compatibility. 2002-06-18
*
*****************************************************************************/
! CopyStmt: COPY opt_binary qualified_name opt_oids copy_from
! copy_file_name copy_delimiter opt_with copy_opt_list
{
CopyStmt *n = makeNode(CopyStmt);
n->relation = $3;
! n->is_from = $5;
n->filename = $6;
!
! n->options = NIL;
! /* Concatenate user-supplied flags */
! if ($2)
! n->options = lappend(n->options, $2);
! if ($4)
! n->options = lappend(n->options, $4);
! if ($7)
! n->options = lappend(n->options, $7);
! if ($9)
! n->options = nconc(n->options, $9);
$$ = (Node *)n;
}
;
! copy_from:
! FROM { $$ = TRUE; }
! | TO { $$ = FALSE; }
;
/*
***************
*** 1332,1361 ****
| STDOUT { $$ = NULL; }
;
! opt_binary: BINARY { $$ = TRUE; }
! | /*EMPTY*/ { $$ = FALSE; }
;
! opt_with_copy:
! WITH OIDS { $$ = TRUE; }
! | /*EMPTY*/ { $$ = FALSE; }
;
- /*
- * the default copy delimiter is tab but the user can configure it
- */
copy_delimiter:
! opt_using DELIMITERS Sconst { $$ = $3; }
! | /*EMPTY*/ { $$ = "\t"; }
;
! opt_using: USING {}
| /*EMPTY*/ {}
;
- copy_null: WITH NULL_P AS Sconst { $$ = $4; }
- | /*EMPTY*/ { $$ = "\\N"; }
- ;
/*****************************************************************************
*
--- 1346,1424 ----
| STDOUT { $$ = NULL; }
;
!
!
! copy_opt_list:
! copy_opt_list copy_opt_item { $$ = lappend($1, $2); }
! | /* EMPTY */ { $$ = NIL; }
;
!
! copy_opt_item:
! BINARY
! {
! $$ = makeNode(DefElem);
! $$->defname = "binary";
! $$->arg = (Node *)makeInteger(TRUE);
! }
! | OIDS
! {
! $$ = makeNode(DefElem);
! $$->defname = "oids";
! $$->arg = (Node *)makeInteger(TRUE);
! }
! | DELIMITER Sconst
! {
! $$ = makeNode(DefElem);
! $$->defname = "delimiter";
! $$->arg = (Node *)makeString($2);
! }
! | NULL_P AS Sconst
! {
! $$ = makeNode(DefElem);
! $$->defname = "null";
! $$->arg = (Node *)makeString($3);
! }
! ;
!
! /* The following exist for backward compatibility */
!
! opt_binary:
! BINARY
! {
! $$ = makeNode(DefElem);
! $$->defname = "binary";
! $$->arg = (Node *)makeInteger(TRUE);
! }
! | /*EMPTY*/ { $$ = NULL; }
! ;
!
! opt_oids:
! WITH OIDS
! {
! $$ = makeNode(DefElem);
! $$->defname = "oids";
! $$->arg = (Node *)makeInteger(TRUE);
! }
! | /*EMPTY*/ { $$ = NULL; }
;
copy_delimiter:
! /* USING DELIMITERS kept for backward compatibility. 2002-06-15 */
! opt_using DELIMITERS Sconst
! {
! $$ = makeNode(DefElem);
! $$->defname = "delimiter";
! $$->arg = (Node *)makeString($3);
! }
! | /*EMPTY*/ { $$ = NULL; }
;
! opt_using:
! USING {}
| /*EMPTY*/ {}
;
/*****************************************************************************
*
***************
*** 3428,3437 ****
| /* EMPTY */ { $$ = NIL; }
;
- /*
- * createdb_opt_item returns 2-element lists, with the first element
- * being an integer code to indicate which item was specified.
- */
createdb_opt_item:
LOCATION opt_equal Sconst
{
--- 3491,3496 ----
***************
*** 6535,6540 ****
--- 6594,6600 ----
| DEFERRED
| DEFINER
| DELETE_P
+ | DELIMITER
| DELIMITERS
| DOMAIN_P
| DOUBLE
Index: src/backend/parser/keywords.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/parser/keywords.c,v
retrieving revision 1.114
diff -c -r1.114 keywords.c
*** src/backend/parser/keywords.c 15 Jun 2002 03:00:03 -0000 1.114
--- src/backend/parser/keywords.c 19 Jun 2002 06:09:33 -0000
***************
*** 98,103 ****
--- 98,104 ----
{"deferred", DEFERRED},
{"definer", DEFINER},
{"delete", DELETE_P},
+ {"delimiter", DELIMITER},
{"delimiters", DELIMITERS},
{"desc", DESC},
{"distinct", DISTINCT},
Index: src/backend/tcop/utility.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/tcop/utility.c,v
retrieving revision 1.157
diff -c -r1.157 utility.c
*** src/backend/tcop/utility.c 18 Jun 2002 17:27:58 -0000 1.157
--- src/backend/tcop/utility.c 19 Jun 2002 06:09:35 -0000
***************
*** 347,368 ****
{
CopyStmt *stmt = (CopyStmt *) parsetree;
! if (stmt->direction != FROM)
SetQuerySnapshot();
! DoCopy(stmt->relation,
! stmt->binary,
! stmt->oids,
! (bool) (stmt->direction == FROM),
! (bool) (stmt->filename == NULL),
!
! /*
! * null filename means copy to/from stdout/stdin, rather
! * than to/from a file.
! */
! stmt->filename,
! stmt->delimiter,
! stmt->null_print);
}
break;
--- 347,356 ----
{
CopyStmt *stmt = (CopyStmt *) parsetree;
! if (!stmt->is_from)
SetQuerySnapshot();
! DoCopy(stmt);
}
break;
Index: src/bin/pgaccess/doc/html/tutorial/tut_edit.html
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pgaccess/doc/html/tutorial/tut_edit.html,v
retrieving revision 1.4
diff -c -r1.4 tut_edit.html
*** src/bin/pgaccess/doc/html/tutorial/tut_edit.html 30 Oct 1999 16:18:44 -0000 1.4
--- src/bin/pgaccess/doc/html/tutorial/tut_edit.html 19 Jun 2002 06:09:35 -0000
***************
*** 29,35 ****
Notice that there are two consecutive tildes to allow for the fact that this
particular entry doesn't have anything in the Editor field.
You can then perform a Query as follows:
! COPY psyref FROM '/home/jim/newref.txt' USING DELIMITERS
'~';
This will read the records from newref.txt and insert them into the
table psyref. See the PostgreSQL documentation under the headings
--- 29,35 ----
Notice that there are two consecutive tildes to allow for the fact that this
particular entry doesn't have anything in the Editor field.
You can then perform a Query as follows:
! COPY psyref FROM '/home/jim/newref.txt' WITH DELIMITER
'~';
This will read the records from newref.txt and insert them into the
table psyref. See the PostgreSQL documentation under the headings
Index: src/bin/pgaccess/lib/mainlib.tcl
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pgaccess/lib/mainlib.tcl,v
retrieving revision 1.8
diff -c -r1.8 mainlib.tcl
*** src/bin/pgaccess/lib/mainlib.tcl 30 May 2001 18:08:24 -0000 1.8
--- src/bin/pgaccess/lib/mainlib.tcl 19 Jun 2002 06:09:36 -0000
***************
*** 636,641 ****
--- 636,643 ----
if {$PgAcVar(impexp,delimiter)==""} {
set sup ""
} else {
+ # now we use WITH DELIMITER, but keep old syntax for
+ # backward compatibility. 2002-06-15
set sup " USING DELIMITERS '$PgAcVar(impexp,delimiter)'"
}
if {[.pgaw:ImportExport.expbtn cget -text]=="Import"} {
Index: src/bin/pgaccess/lib/help/copy.hlp
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pgaccess/lib/help/copy.hlp,v
retrieving revision 1.4
diff -c -r1.4 copy.hlp
*** src/bin/pgaccess/lib/help/copy.hlp 30 Oct 1999 16:18:50 -0000 1.4
--- src/bin/pgaccess/lib/help/copy.hlp 19 Jun 2002 06:09:42 -0000
***************
*** 5,14 ****
" {} "
COPY \[ BINARY \] table \[ WITH OIDS \]
FROM { 'filename' | stdin }
! \[ USING DELIMITERS 'delimiter' \]
COPY \[ BINARY \] table \[ WITH OIDS \]
TO { 'filename' | stdout }
! \[ USING DELIMITERS 'delimiter' \]
" {code} "Inputs" {bold} "
--- 5,14 ----
" {} "
COPY \[ BINARY \] table \[ WITH OIDS \]
FROM { 'filename' | stdin }
! \[ WITH DELIMITER 'delimiter' \]
COPY \[ BINARY \] table \[ WITH OIDS \]
TO { 'filename' | stdout }
! \[ WITH DELIMITER 'delimiter' \]
" {code} "Inputs" {bold} "
***************
*** 44,50 ****
" {} "Usage" {bold} "
The following example copies a table to standard output, using a vertical bar \(\"|\"\) as the field delimiter:
! COPY country TO stdout USING DELIMITERS '|';
To copy data from a Unix file into a table \"country\":
COPY country FROM '/usr1/proj/bray/sql/country_data';
--- 44,50 ----
" {} "Usage" {bold} "
The following example copies a table to standard output, using a vertical bar \(\"|\"\) as the field delimiter:
! COPY country TO stdout WITH DELIMITER '|';
To copy data from a Unix file into a table \"country\":
COPY country FROM '/usr1/proj/bray/sql/country_data';
***************
*** 93,105 ****
The " {} "BINARY" {bold} " keyword will force all data to be stored/read as binary objects rather than as text. It is somewhat faster than the normal copy command, but is not generally portable, and the files \
generated are somewhat larger, although this factor is highly dependent on the data itself. By default, a text copy uses a tab \
! \(\"\\t\"\) character as a delimiter. The delimiter may also be changed to any other single character with the keyword phrase USING DELIMITERS. Characters in data fields which happen to match the delimiter character will be quoted.
You must have select access on any table whose values are read by " {} "COPY" {bold} ", and either insert or update access to a table into which values are being inserted by \
" {} "COPY" {bold} ". The backend also needs appropriate Unix permissions for any file read or written by \
" {} "COPY" {bold} ".
! The keyword phrase " {} "USING DELIMITERS" {bold} " specifies a single character to be used for all delimiters between columns. If multiple characters are specified in the delimiter string, only the first \
! character is used.
Tip: Do not confuse " {} "COPY" {bold} " with the psql instruction \\copy. "
--- 93,104 ----
The " {} "BINARY" {bold} " keyword will force all data to be stored/read as binary objects rather than as text. It is somewhat faster than the normal copy command, but is not generally portable, and the files \
generated are somewhat larger, although this factor is highly dependent on the data itself. By default, a text copy uses a tab \
! \(\"\\t\"\) character as a delimiter. The delimiter may also be changed to any other single character with the keyword phrase WITH DELIMITER. Characters in data fields which happen to match the delimiter character will be quoted.
You must have select access on any table whose values are read by " {} "COPY" {bold} ", and either insert or update access to a table into which values are being inserted by \
" {} "COPY" {bold} ". The backend also needs appropriate Unix permissions for any file read or written by \
" {} "COPY" {bold} ".
! The keyword phrase " {} "WITH DELIMITER" {bold} " specifies a single character to be used for all delimiters between columns.
Tip: Do not confuse " {} "COPY" {bold} " with the psql instruction \\copy. "
Index: src/bin/psql/copy.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/copy.c,v
retrieving revision 1.22
diff -c -r1.22 copy.c
*** src/bin/psql/copy.c 24 Apr 2002 21:00:10 -0000 1.22
--- src/bin/psql/copy.c 19 Jun 2002 06:09:43 -0000
***************
*** 36,42 ****
* parse_slash_copy
* -- parses \copy command line
*
! * Accepted syntax: \copy [binary] table|"table" [with oids] from|to filename|'filename' [ using delimiters ''] [ with null as 'string' ]
* (binary is not here yet)
*
* returns a malloc'ed structure with the options, or NULL on parsing error
--- 36,42 ----
* parse_slash_copy
* -- parses \copy command line
*
! * Accepted syntax: \copy [binary] table|"table" [with oids] from|to filename|'filename' [with ] [ oids ] [ delimiter ''] [ null as 'string' ]
* (binary is not here yet)
*
* returns a malloc'ed structure with the options, or NULL on parsing error
***************
*** 161,192 ****
token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
if (token)
{
! if (strcasecmp(token, "using") == 0)
{
! token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
! if (!token || strcasecmp(token, "delimiters") != 0)
! error = true;
! else
{
! token = strtokx(NULL, " \t\n\r", "'", '\\', NULL, NULL, pset.encoding);
! if (token)
{
! result->delim = xstrdup(token);
! token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
}
! else
! error = true;
! }
! }
!
! if (!error && token)
! {
! if (strcasecmp(token, "with") == 0)
! {
! token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
! if (!token || strcasecmp(token, "null") != 0)
! error = true;
! else
{
token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
if (!token || strcasecmp(token, "as") != 0)
--- 161,179 ----
token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
if (token)
{
! if (strcasecmp(token, "with") == 0)
{
! while (!error && (token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding)))
{
! if (strcasecmp(token, "delimiter") == 0)
{
! token = strtokx(NULL, " \t\n\r", "'", '\\', NULL, NULL, pset.encoding);
! if (token)
! result->delim = xstrdup(token);
! else
! error = true;
}
! else if (strcasecmp(token, "null") == 0)
{
token = strtokx(NULL, " \t\n\r", NULL, '\\', NULL, NULL, pset.encoding);
if (!token || strcasecmp(token, "as") != 0)
***************
*** 196,207 ****
token = strtokx(NULL, " \t\n\r", "'", '\\', NULL, NULL, pset.encoding);
if (token)
result->null = xstrdup(token);
}
}
}
- else
- error = true;
}
}
}
--- 183,196 ----
token = strtokx(NULL, " \t\n\r", "'", '\\', NULL, NULL, pset.encoding);
if (token)
result->null = xstrdup(token);
+ else
+ error = true;
}
}
+ else error = true;
}
}
+ else error = true;
}
}
***************
*** 250,257 ****
appendPQExpBuffer(&query, "BINARY ");
appendPQExpBuffer(&query, "\"%s\" ", options->table);
- if (options->oids)
- appendPQExpBuffer(&query, "WITH OIDS ");
if (options->from)
appendPQExpBuffer(&query, "FROM STDIN");
--- 239,244 ----
***************
*** 259,269 ****
appendPQExpBuffer(&query, "TO STDOUT");
! if (options->delim)
! appendPQExpBuffer(&query, " USING DELIMITERS '%s'", options->delim);
if (options->null)
! appendPQExpBuffer(&query, " WITH NULL AS '%s'", options->null);
if (options->from)
{
--- 246,260 ----
appendPQExpBuffer(&query, "TO STDOUT");
! if (options->oids || options->delim || options->null)
! appendPQExpBuffer(&query, " WITH");
+ if (options->oids)
+ appendPQExpBuffer(&query, " OIDS ");
+ if (options->delim)
+ appendPQExpBuffer(&query, " DELIMITER '%s'", options->delim);
if (options->null)
! appendPQExpBuffer(&query, " NULL AS '%s'", options->null);
if (options->from)
{
Index: src/include/commands/copy.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/commands/copy.h,v
retrieving revision 1.17
diff -c -r1.17 copy.h
*** src/include/commands/copy.h 29 Mar 2002 19:06:21 -0000 1.17
--- src/include/commands/copy.h 19 Jun 2002 06:09:44 -0000
***************
*** 14,25 ****
#ifndef COPY_H
#define COPY_H
#include "nodes/primnodes.h"
extern int copy_lineno;
! void DoCopy(const RangeVar *relation, bool binary, bool oids,
! bool from, bool pipe,
! char *filename, char *delim, char *null_print);
#endif /* COPY_H */
--- 14,24 ----
#ifndef COPY_H
#define COPY_H
+ #include "nodes/parsenodes.h"
#include "nodes/primnodes.h"
extern int copy_lineno;
! void DoCopy(const CopyStmt *stmt);
#endif /* COPY_H */
Index: src/include/commands/dbcommands.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/commands/dbcommands.h,v
retrieving revision 1.22
diff -c -r1.22 dbcommands.h
*** src/include/commands/dbcommands.h 18 Jun 2002 17:27:58 -0000 1.22
--- src/include/commands/dbcommands.h 19 Jun 2002 06:09:44 -0000
***************
*** 16,22 ****
#include
! extern void createdb(CreatedbStmt *stmt);
extern void dropdb(const char *dbname);
extern void AlterDatabaseSet(AlterDatabaseSetStmt *stmt);
--- 16,22 ----
#include
! extern void createdb(const CreatedbStmt *stmt);
extern void dropdb(const char *dbname);
extern void AlterDatabaseSet(AlterDatabaseSetStmt *stmt);
Index: src/include/nodes/parsenodes.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/nodes/parsenodes.h,v
retrieving revision 1.180
diff -c -r1.180 parsenodes.h
*** src/include/nodes/parsenodes.h 18 Jun 2002 17:27:58 -0000 1.180
--- src/include/nodes/parsenodes.h 19 Jun 2002 06:09:51 -0000
***************
*** 851,863 ****
typedef struct CopyStmt
{
NodeTag type;
- bool binary; /* is a binary copy? */
RangeVar *relation; /* the relation to copy */
! bool oids; /* copy oid's? */
! int direction; /* TO or FROM */
char *filename; /* if NULL, use stdin/stdout */
! char *delimiter; /* delimiter character, \t by default */
! char *null_print; /* how to print NULLs, `\N' by default */
} CopyStmt;
/* ----------------------
--- 851,860 ----
typedef struct CopyStmt
{
NodeTag type;
RangeVar *relation; /* the relation to copy */
! bool is_from; /* TO or FROM */
char *filename; /* if NULL, use stdin/stdout */
! List *options; /* List of DefElem nodes */
} CopyStmt;
/* ----------------------
Index: src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java,v
retrieving revision 1.46
diff -c -r1.46 DatabaseMetaData.java
*** src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java 11 Jun 2002 02:55:16 -0000 1.46
--- src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java 19 Jun 2002 06:09:56 -0000
***************
*** 370,376 ****
*/
public String getSQLKeywords() throws SQLException
{
! return "abort,acl,add,aggregate,append,archive,arch_store,backward,binary,change,cluster,copy,database,delimiters,do,extend,explain,forward,heavy,index,inherits,isnull,light,listen,load,merge,nothing,notify,notnull,oids,purge,rename,replace,retrieve,returns,rule,recipe,setof,stdin,stdout,store,vacuum,verbose,version";
}
public String getNumericFunctions() throws SQLException
--- 370,376 ----
*/
public String getSQLKeywords() throws SQLException
{
! return "abort,acl,add,aggregate,append,archive,arch_store,backward,binary,change,cluster,copy,database,delimiter,delimiters,do,extend,explain,forward,heavy,index,inherits,isnull,light,listen,load,merge,nothing,notify,notnull,oids,purge,rename,replace,retrieve,returns,rule,recipe,setof,stdin,stdout,store,vacuum,verbose,version";
}
public String getNumericFunctions() throws SQLException
Index: src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java,v
retrieving revision 1.55
diff -c -r1.55 DatabaseMetaData.java
*** src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java 11 Jun 2002 02:55:16 -0000 1.55
--- src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java 19 Jun 2002 06:10:06 -0000
***************
*** 409,415 ****
public String getSQLKeywords() throws SQLException
{
if (Driver.logDebug) Driver.debug("getSQLKeyWords");
! return "abort,acl,add,aggregate,append,archive,arch_store,backward,binary,change,cluster,copy,database,delimiters,do,extend,explain,forward,heavy,index,inherits,isnull,light,listen,load,merge,nothing,notify,notnull,oids,purge,rename,replace,retrieve,returns,rule,recipe,setof,stdin,stdout,store,vacuum,verbose,version";
}
public String getNumericFunctions() throws SQLException
--- 409,415 ----
public String getSQLKeywords() throws SQLException
{
if (Driver.logDebug) Driver.debug("getSQLKeyWords");
! return "abort,acl,add,aggregate,append,archive,arch_store,backward,binary,change,cluster,copy,database,delimiter,delimiters,do,extend,explain,forward,heavy,index,inherits,isnull,light,listen,load,merge,nothing,notify,notnull,oids,purge,rename,replace,retrieve,returns,rule,recipe,setof,stdin,stdout,store,vacuum,verbose,version";
}
public String getNumericFunctions() throws SQLException
Index: src/test/locale/de_DE.ISO8859-1/test-de-upper.sql.in
===================================================================
RCS file: /cvsroot/pgsql/src/test/locale/de_DE.ISO8859-1/test-de-upper.sql.in,v
retrieving revision 1.1
diff -c -r1.1 test-de-upper.sql.in
*** src/test/locale/de_DE.ISO8859-1/test-de-upper.sql.in 19 Mar 2000 19:52:43 -0000 1.1
--- src/test/locale/de_DE.ISO8859-1/test-de-upper.sql.in 19 Jun 2002 06:10:07 -0000
***************
*** 1,4 ****
! COPY wordlist FROM stdin USING DELIMITERS '|';
AAA |ÄÄÄ
AAAAa |ÄÄÄÄä
BBBB |BBBB
--- 1,4 ----
! COPY wordlist FROM stdin WITH DELIMITER '|';
AAA |ÄÄÄ
AAAAa |ÄÄÄÄä
BBBB |BBBB
Index: src/test/locale/de_DE.ISO8859-1/test-de.sql.in
===================================================================
RCS file: /cvsroot/pgsql/src/test/locale/de_DE.ISO8859-1/test-de.sql.in,v
retrieving revision 1.1
diff -c -r1.1 test-de.sql.in
*** src/test/locale/de_DE.ISO8859-1/test-de.sql.in 19 Mar 2000 19:52:43 -0000 1.1
--- src/test/locale/de_DE.ISO8859-1/test-de.sql.in 19 Jun 2002 06:10:07 -0000
***************
*** 1,4 ****
! COPY wordlist FROM stdin USING DELIMITERS '|';
AAA |ÄÄÄ
AAAAa |ÄÄÄÄä
BBBB |BBBB
--- 1,4 ----
! COPY wordlist FROM stdin WITH DELIMITER '|';
AAA |ÄÄÄ
AAAAa |ÄÄÄÄä
BBBB |BBBB
Index: src/test/locale/gr_GR.ISO8859-7/test-gr.sql.in
===================================================================
RCS file: /cvsroot/pgsql/src/test/locale/gr_GR.ISO8859-7/test-gr.sql.in,v
retrieving revision 1.1
diff -c -r1.1 test-gr.sql.in
*** src/test/locale/gr_GR.ISO8859-7/test-gr.sql.in 29 Mar 1999 08:59:54 -0000 1.1
--- src/test/locale/gr_GR.ISO8859-7/test-gr.sql.in 19 Jun 2002 06:10:07 -0000
***************
*** 1,4 ****
! COPY usastates FROM stdin USING DELIMITERS '|';
AK|Alaska |ÁëÜóêá
WA|Washington |Ãïõüóéíãêôïí
OR|Oregon |Ïñåãêïí
--- 1,4 ----
! COPY usastates FROM stdin WITH DELIMITER '|';
AK|Alaska |ÁëÜóêá
WA|Washington |Ãïõüóéíãêôïí
OR|Oregon |Ïñåãêïí
Index: src/test/locale/koi8-r/test-koi8.sql.in
===================================================================
RCS file: /cvsroot/pgsql/src/test/locale/koi8-r/test-koi8.sql.in,v
retrieving revision 1.1
diff -c -r1.1 test-koi8.sql.in
*** src/test/locale/koi8-r/test-koi8.sql.in 16 Jun 1998 06:41:58 -0000 1.1
--- src/test/locale/koi8-r/test-koi8.sql.in 19 Jun 2002 06:10:07 -0000
***************
*** 1,4 ****
! COPY usastates FROM stdin USING DELIMITERS '|';
AK|Alaska |áÌÑÓËÁ
WA|Washington |÷ÁÛÉÎÇÔÏÎ
OR|Oregon |ïÒÅÇÏÎ
--- 1,4 ----
! COPY usastates FROM stdin WITH DELIMITER '|';
AK|Alaska |áÌÑÓËÁ
WA|Washington |÷ÁÛÉÎÇÔÏÎ
OR|Oregon |ïÒÅÇÏÎ
Index: src/test/locale/koi8-to-win1251/test-koi8.sql.in
===================================================================
RCS file: /cvsroot/pgsql/src/test/locale/koi8-to-win1251/test-koi8.sql.in,v
retrieving revision 1.1
diff -c -r1.1 test-koi8.sql.in
*** src/test/locale/koi8-to-win1251/test-koi8.sql.in 29 Mar 1999 09:00:08 -0000 1.1
--- src/test/locale/koi8-to-win1251/test-koi8.sql.in 19 Jun 2002 06:10:07 -0000
***************
*** 1,4 ****
! COPY usastates FROM stdin USING DELIMITERS '|';
AK|Alaska |Àëÿñêà
WA|Washington |Âàøèíãòîí
OR|Oregon |Îðåãîí
--- 1,4 ----
! COPY usastates FROM stdin WITH DELIMITER '|';
AK|Alaska |Àëÿñêà
WA|Washington |Âàøèíãòîí
OR|Oregon |Îðåãîí