Fix regression test output

Running tests with a 8.4 server will output different results, so fix accordingly. Also, update the version number in bin/postgresql script.
ossc-db · Jan 26, 2017 · a55caf1 · a55caf1
1 parent b449514
commit a55caf1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/bin/expected/load_check_1.out b/bin/expected/load_check_1.out
@@ -9,7 +9,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/check1.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check1.prs
@@ -81,7 +81,7 @@ DETAIL:  Table contains duplicated values.
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/check2.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check2.prs
@@ -145,7 +145,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/check3.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check3.prs
@@ -220,7 +220,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/check4.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check4.prs

diff --git a/bin/expected/load_filter_3.out b/bin/expected/load_filter_3.out
@@ -50,7 +50,7 @@ DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! pg_bulkload -d contrib_regression data/csv4.ctl -i data/data7.csv -l results/filter_e.log -P results/filter_e1.prs -u results/filter_e1.dup -o 'FILTER=outarg_f()'
 NOTICE: BULK LOAD START
 ERROR: query failed: ERROR:  could not create unique index "target_pkey"
-DETAIL:  Key (id)=(1) is duplicated.
+DETAIL:  Table contains duplicated values.
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! pg_bulkload -d contrib_regression data/csv4.ctl -i data/data6.csv -l results/filter_e.log -P results/filter_e1.prs -u results/filter_e1.dup -o 'FILTER=setof_f()'
 NOTICE: BULK LOAD START
@@ -73,7 +73,7 @@ DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! pg_bulkload -d contrib_regression data/csv4.ctl -i data/data7.csv -l results/filter_e.log -P results/filter_e1.prs -u results/filter_e1.dup -o 'FILTER=rec_mismatch_f()'
 NOTICE: BULK LOAD START
 ERROR: query failed: ERROR:  could not create unique index "target_pkey"
-DETAIL:  Key (id)=(1) is duplicated.
+DETAIL:  Table contains duplicated values.
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 -- FILTER option error
 \! pg_bulkload -d contrib_regression data/csv4.ctl -i data/data6.csv -l results/filter_e.log -P results/filter_e1.prs -u results/filter_e1.dup -o 'FILTER="f1'
@@ -143,7 +143,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter1.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data6.csv
 PARSE_BADFILE = .../filter1.prs
@@ -217,7 +217,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter2.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data6.csv
 PARSE_BADFILE = .../filter2.prs
@@ -291,7 +291,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter3.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data6.csv
 PARSE_BADFILE = .../filter3.prs
@@ -359,7 +359,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/filter4.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data7.csv
 PARSE_BADFILE = .../filter4.prs
@@ -431,7 +431,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter5.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../data4.bin
 PARSE_BADFILE = .../filter5.prs

diff --git a/bin/expected/load_function_1.out b/bin/expected/load_function_1.out
@@ -61,7 +61,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/function1.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = public.load_function1(1,5,'A''')
 PARSE_BADFILE = .../function1.prs
@@ -123,7 +123,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/function2.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = "public.load_function1( - - - 3, -+- 5,'''B')"
 PARSE_BADFILE = .../function2.prs
@@ -200,7 +200,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/function3.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = "public	.	load_function1	 (	 3	 ,	 '7'	 ,	 nUlL	 )	 "
 PARSE_BADFILE = .../function3.prs
@@ -279,7 +279,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/function4.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function3.prs
 PARSE_BADFILE = .../function4.prs
@@ -327,7 +327,7 @@ NOTICE: BULK LOAD END
 	3 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/function5.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function3.prs
 PARSE_BADFILE = .../function5.prs
@@ -411,7 +411,7 @@ NOTICE: BULK LOAD END
 	4 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/function6.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = "public . load_function1	 (	 3	 ,	 '7'	 ,	 nUlL	 )	 "
 PARSE_BADFILE = .../function6.prs
@@ -492,7 +492,7 @@ NOTICE: BULK LOAD END
 	1 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/function7.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = "public.load_function1(7, 10)"
 PARSE_BADFILE = .../function7.prs
@@ -576,7 +576,7 @@ NOTICE: BULK LOAD END
 	6 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/function8.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = "public.load_function2('216', 0, 'function2', -2, 2, 4, 6, 8, 10, 12)"
 PARSE_BADFILE = .../function8.prs
@@ -668,7 +668,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/function9.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = "public.load_function2('216', 0, 'function2 duplicate', 1,1,1,1,1)"
 PARSE_BADFILE = .../function9.prs
@@ -759,7 +759,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/function10.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function9.dup
 PARSE_BADFILE = .../function10.prs
@@ -876,7 +876,7 @@ DETAIL:  Table contains duplicated values.
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/function13.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function9.dup
 PARSE_BADFILE = .../function13.prs
@@ -907,7 +907,7 @@ ERROR: query failed: ERROR:  Maximum duplicate error count exceeded
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/function14.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function9.dup
 PARSE_BADFILE = .../function14.prs
@@ -944,7 +944,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/function14.log
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function9.dup
 PARSE_BADFILE = .../function14.prs
@@ -971,7 +971,7 @@ Duplicate error Record 1: Rejected - duplicate key value violates unique constra
 Duplicate error Record 2: Rejected - duplicate key value violates unique constraint "customer_pkey"
 Maximum duplicate error count exceeded
 
-pg_bulkload 3.1.12 on <TIMESTAMP>
+pg_bulkload 3.1.13 on <TIMESTAMP>
 
 INPUT = .../function9.dup
 PARSE_BADFILE = .../function14.prs

diff --git a/bin/postgresql b/bin/postgresql
@@ -91,7 +91,7 @@ while [ $# -gt 0 ];do
         ;;
     -V|--version)
         # Show a version of pg_bulkload and PostgreSQL and exit normally
-        echo "pg_bulkload 3.1.12"
+        echo "pg_bulkload 3.1.13"
         pg_ctl --version
         exit 0
         ;;