summaryrefslogtreecommitdiff
path: root/src/interfaces/ecpg/test/expected
diff options
context:
space:
mode:
authorMichael Meskes <meskes@postgresql.org>2006-08-05 16:48:48 +0000
committerMichael Meskes <meskes@postgresql.org>2006-08-05 16:48:48 +0000
commit1d28bf25896eb6400547c46e8a9587370fd09c1d (patch)
tree41033db62c07f6d811991c16e0ddea7830a51c8e /src/interfaces/ecpg/test/expected
parent63d3f5e593203c5dd79cac490834347c0a319592 (diff)
Two more changes to regression tests to fix two differences in different setups.
Diffstat (limited to 'src/interfaces/ecpg/test/expected')
-rw-r--r--src/interfaces/ecpg/test/expected/complex-test4.c2
-rw-r--r--src/interfaces/ecpg/test/expected/complex-test4.stdout2
-rw-r--r--src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c2
-rw-r--r--src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/ecpg/test/expected/complex-test4.c b/src/interfaces/ecpg/test/expected/complex-test4.c
index cd82f235c06..caf3f4f9fb3 100644
--- a/src/interfaces/ecpg/test/expected/complex-test4.c
+++ b/src/interfaces/ecpg/test/expected/complex-test4.c
@@ -152,7 +152,7 @@ main (void)
strcpy(t, "0123456789");
- setlocale(LC_ALL, "de_DE");
+ setlocale(LC_ALL, "C");
ECPGdebug(1, stderr);
diff --git a/src/interfaces/ecpg/test/expected/complex-test4.stdout b/src/interfaces/ecpg/test/expected/complex-test4.stdout
index 55a1ffb0d42..7e8a326fa11 100644
--- a/src/interfaces/ecpg/test/expected/complex-test4.stdout
+++ b/src/interfaces/ecpg/test/expected/complex-test4.stdout
@@ -1,4 +1,4 @@
-Found f=14,070000 text=0123456789 b=1
+Found f=14.070000 text=0123456789 b=1
Found a[0] = 9
Found a[1] = 8
Found a[2] = 7
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
index ea6831a9fcf..466c5de7442 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
@@ -384,7 +384,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
in = "1980-04-12 3:49:44 ";
i = PGTYPEStimestamp_defmt_asc(in, fmt, &ts1);
text = PGTYPEStimestamp_to_asc(ts1);
- printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i);
+ printf("timestamp_defmt_asc(%s, NULL) = %s, error: %d\n", in, text, i);
free(text);
fmt = "%B %d, %Y. Time: %I:%M%p";
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout
index 30fc6e54bd3..29f321928f7 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout
@@ -41,7 +41,7 @@ timestamp_defmt_asc(abc
18 October %34 17:28:44 CEST 80, abc%n %C %B %%%d %H:%M:%S %Z %y) = 1880-10-31 15:28:44, error (should be error!): 1
timestamp_defmt_asc(abc
18 October %34 17:28:44 CEST 80, ) = 1880-10-31 15:28:44, error (should be error!): 1
-timestamp_defmt_asc(1980-04-12 3:49:44 , (null)) = 1980-04-12 03:49:44, error: 0
+timestamp_defmt_asc(1980-04-12 3:49:44 , NULL) = 1980-04-12 03:49:44, error: 0
timestamp_defmt_asc(July 14, 1988. Time: 9:15am, %B %d, %Y. Time: %I:%M%p) = 1988-07-14 09:15:00, error: 0
timestamp_defmt_asc(September 6 at 01:30 pm in the year 1983, %B %d at %I:%M %p in the year %Y) = 1983-09-06 13:30:00, error: 0
timestamp_defmt_asc( 1976, July 14. Time: 9:15am, %Y, %B %d. Time: %I:%M %p) = 1976-07-14 09:15:00, error: 0