diff options
| author | Michael Meskes <meskes@postgresql.org> | 2009-02-02 15:35:28 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2009-02-02 15:35:28 +0000 |
| commit | 77ca0453847fe98d109d9874d84dc91ec56d1209 (patch) | |
| tree | 65c1f8b64c5fa16a491acfda7a200647ea3d7175 /src/interfaces/ecpg/test | |
| parent | 5e21197c7bd865d1ca9426e48a04deffe4ad6f81 (diff) | |
| download | postgresql-77ca0453847fe98d109d9874d84dc91ec56d1209.tar.gz postgresql-77ca0453847fe98d109d9874d84dc91ec56d1209.zip | |
Fixed bug in %s handling.
Diffstat (limited to 'src/interfaces/ecpg/test')
4 files changed, 20 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c index 356e3946c00..a52ad13fb9a 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c @@ -422,17 +422,24 @@ if (sqlca.sqlcode < 0) sqlprint ( );} printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); + in = "1234567890"; + fmt = "%s"; + 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); + free(text); + { ECPGtrans(__LINE__, NULL, "rollback"); -#line 351 "dt_test.pgc" +#line 358 "dt_test.pgc" if (sqlca.sqlcode < 0) sqlprint ( );} -#line 351 "dt_test.pgc" +#line 358 "dt_test.pgc" { ECPGdisconnect(__LINE__, "CURRENT"); -#line 352 "dt_test.pgc" +#line 359 "dt_test.pgc" if (sqlca.sqlcode < 0) sqlprint ( );} -#line 352 "dt_test.pgc" +#line 359 "dt_test.pgc" return (0); diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr index a068d5ef1cb..08680b9ccf3 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr @@ -42,7 +42,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_get_data on line 38: RESULT: 2000-07-12 17:34:29 offset: -1; array: yes [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGtrans on line 351: action "rollback"; connection "regress1" +[NO_PID]: ECPGtrans on line 358: action "rollback"; connection "regress1" [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection regress1 closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout index 03f01de0c6f..a2ff5f7a3b2 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stdout @@ -46,3 +46,4 @@ timestamp_defmt_asc(September 6 at 01:30 pm in the year 1983, %B %d at %I:%M %p timestamp_defmt_asc( 1976, July 14. Time: 9:15am, %Y, %B %d. Time: %I:%M %p) = 1976-07-14 09:15:00, error: 0 timestamp_defmt_asc( 1976, July 14. Time: 9:15 am, %Y, %B %d. Time: %I:%M%p) = 1976-07-14 09:15:00, error: 0 timestamp_defmt_asc( 1976, P.M. July 14. Time: 9:15, %Y, %P %B %d. Time: %I:%M) = 1976-07-14 21:15:00, error: 0 +timestamp_defmt_asc(1234567890, %s) = 2009-02-13 23:31:30, error: 0 diff --git a/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc index fcf39cecc7c..3ed20614541 100644 --- a/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc +++ b/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc @@ -348,6 +348,13 @@ main(void) printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i); free(text); + in = "1234567890"; + fmt = "%s"; + 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); + free(text); + exec sql rollback; exec sql disconnect; |