Thread: pgbulkload - pgbulkload: Rename ON_DUPLICATE = ERROR | REMOVE_OLD |
pgbulkload - pgbulkload: Rename ON_DUPLICATE = ERROR | REMOVE_OLD |
From
itagaki@pgfoundry.org (User Itagaki)
Date:
Log Message: ----------- Rename ON_DUPLICATE = ERROR | REMOVE_OLD | REMOVE_NEW to ON_DUPLICATE_KEEP = NEW | OLD. Change the default values for PARSE_ERRORS and DUPLICATE_ERRORS to 0. Adjust regression tests to be passed on UTF8 databases. (SQL_ASCII expected previously) Modified Files: -------------- pgbulkload/bin: pg_bulkload.c (r1.21 -> r1.22) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/pg_bulkload.c?r1=1.21&r2=1.22) recovery.c (r1.6 -> r1.7) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/recovery.c?r1=1.6&r2=1.7) pgbulkload/bin/data: csv3.ctl (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/data/csv3.ctl?r1=1.1&r2=1.2) csv4.ctl (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/data/csv4.ctl?r1=1.1&r2=1.2) csv5.ctl (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/data/csv5.ctl?r1=1.1&r2=1.2) pgbulkload/bin/expected: load_bin.out (r1.7 -> r1.8) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_bin.out?r1=1.7&r2=1.8) load_check.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_check.out?r1=1.1&r2=1.2) load_csv.out (r1.9 -> r1.10) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_csv.out?r1=1.9&r2=1.10) load_encoding.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_encoding.out?r1=1.1&r2=1.2) load_filter-8.3.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_filter-8.3.out?r1=1.1&r2=1.2) load_filter-8.4.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_filter-8.4.out?r1=1.1&r2=1.2) load_filter-9.0.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_filter-9.0.out?r1=1.1&r2=1.2) load_function-8.3.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_function-8.3.out?r1=1.1&r2=1.2) load_function-8.4.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_function-8.4.out?r1=1.1&r2=1.2) load_function-9.0.out (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_function-9.0.out?r1=1.1&r2=1.2) load_parallel.out (r1.9 -> r1.10) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_parallel.out?r1=1.9&r2=1.10) load_remote.out (r1.9 -> r1.10) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/expected/load_remote.out?r1=1.9&r2=1.10) pgbulkload/bin/pgut: pgut-fe.c (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/pgut/pgut-fe.c?r1=1.1&r2=1.2) pgut-fe.h (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/pgut/pgut-fe.h?r1=1.1&r2=1.2) pgut.c (r1.16 -> r1.17) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/pgut/pgut.c?r1=1.16&r2=1.17) pgut.h (r1.17 -> r1.18) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/pgut/pgut.h?r1=1.17&r2=1.18) pgbulkload/bin/sql: load_bin.sql (r1.3 -> r1.4) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_bin.sql?r1=1.3&r2=1.4) load_check.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_check.sql?r1=1.1&r2=1.2) load_csv.sql (r1.5 -> r1.6) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_csv.sql?r1=1.5&r2=1.6) load_filter-8.3.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_filter-8.3.sql?r1=1.1&r2=1.2) load_filter-8.4.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_filter-8.4.sql?r1=1.1&r2=1.2) load_filter-9.0.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_filter-9.0.sql?r1=1.1&r2=1.2) load_function-8.3.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_function-8.3.sql?r1=1.1&r2=1.2) load_function-8.4.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_function-8.4.sql?r1=1.1&r2=1.2) load_function-9.0.sql (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_function-9.0.sql?r1=1.1&r2=1.2) load_parallel.sql (r1.3 -> r1.4) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_parallel.sql?r1=1.3&r2=1.4) load_remote.sql (r1.3 -> r1.4) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/bin/sql/load_remote.sql?r1=1.3&r2=1.4) pgbulkload/include: pg_bulkload.h (r1.17 -> r1.18) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/include/pg_bulkload.h?r1=1.17&r2=1.18) reader.h (r1.15 -> r1.16) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/include/reader.h?r1=1.15&r2=1.16) pgbulkload/lib: parser_csv.c (r1.14 -> r1.15) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/parser_csv.c?r1=1.14&r2=1.15) parser_function.c (r1.7 -> r1.8) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/parser_function.c?r1=1.7&r2=1.8) pg_btree.c (r1.16 -> r1.17) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/pg_btree.c?r1=1.16&r2=1.17) reader.c (r1.19 -> r1.20) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/reader.c?r1=1.19&r2=1.20) writer_buffered.c (r1.4 -> r1.5) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/writer_buffered.c?r1=1.4&r2=1.5) writer_direct.c (r1.8 -> r1.9) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/writer_direct.c?r1=1.8&r2=1.9) writer_parallel.c (r1.10 -> r1.11) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/writer_parallel.c?r1=1.10&r2=1.11) pgbulkload/lib/pgut: pgut-be.c (r1.4 -> r1.5) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/pgut/pgut-be.c?r1=1.4&r2=1.5) pgut-be.h (r1.8 -> r1.9) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/pgut/pgut-be.h?r1=1.8&r2=1.9) pgut-ipc.c (r1.7 -> r1.8) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/lib/pgut/pgut-ipc.c?r1=1.7&r2=1.8) pgbulkload/msvc: bin.vcproj (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/msvc/bin.vcproj?r1=1.1&r2=1.2) lib.vcproj (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/msvc/lib.vcproj?r1=1.1&r2=1.2) readme.txt (r1.1 -> r1.2) (http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgbulkload/pgbulkload/msvc/readme.txt?r1=1.1&r2=1.2)