|
2 | 2 | * Routines for handling of 'SET var TO', |
3 | 3 | * 'SHOW var' and 'RESET var' statements. |
4 | 4 | * |
5 | | - * $Id: variable.c,v 1.23 1997/11/21 18:11:20 momjian Exp $ |
| 5 | + * $Id: variable.c,v 1.24 1997/12/04 23:17:13 thomas Exp $ |
6 | 6 | * |
7 | 7 | */ |
8 | 8 |
|
@@ -351,33 +351,40 @@ parse_date(const char *value) |
351 | 351 | { |
352 | 352 | /* Ugh. Somebody ought to write a table driven version -- mjl */ |
353 | 353 |
|
354 | | -if (!strcasecmp(tok,"iso")) |
| 354 | +if (!strcasecmp(tok,"ISO")) |
355 | 355 | { |
356 | 356 | DateStyle=USE_ISO_DATES; |
357 | 357 | dcnt++; |
358 | 358 | } |
359 | | -elseif (!strcasecmp(tok,"sql")) |
| 359 | +elseif (!strcasecmp(tok,"SQL")) |
360 | 360 | { |
361 | 361 | DateStyle=USE_SQL_DATES; |
362 | 362 | dcnt++; |
363 | 363 | } |
364 | | -elseif (!strcasecmp(tok,"postgres")) |
| 364 | +elseif (!strcasecmp(tok,"POSTGRES")) |
365 | 365 | { |
366 | 366 | DateStyle=USE_POSTGRES_DATES; |
367 | 367 | dcnt++; |
368 | 368 | } |
369 | | -elseif (!strncasecmp(tok,"euro",4)) |
| 369 | +elseif (!strcasecmp(tok,"GERMAN")) |
370 | 370 | { |
| 371 | +DateStyle=USE_GERMAN_DATES; |
| 372 | +dcnt++; |
371 | 373 | EuroDates= TRUE; |
372 | | -ecnt++; |
| 374 | +if ((ecnt>0)&& (!EuroDates))ecnt++; |
373 | 375 | } |
374 | | -elseif ((!strcasecmp(tok,"us")) |
375 | | -|| (!strncasecmp(tok,"noneuro",7))) |
| 376 | +elseif (!strncasecmp(tok,"EURO",4)) |
| 377 | +{ |
| 378 | +EuroDates= TRUE; |
| 379 | +if ((dcnt <=0)|| (DateStyle!=USE_GERMAN_DATES))ecnt++; |
| 380 | +} |
| 381 | +elseif ((!strcasecmp(tok,"US")) |
| 382 | +|| (!strncasecmp(tok,"NONEURO",7))) |
376 | 383 | { |
377 | 384 | EuroDates= FALSE; |
378 | | -ecnt++; |
| 385 | +if ((dcnt <=0)|| (DateStyle==USE_GERMAN_DATES))ecnt++; |
379 | 386 | } |
380 | | -elseif (!strcasecmp(tok,"default")) |
| 387 | +elseif (!strcasecmp(tok,"DEFAULT")) |
381 | 388 | { |
382 | 389 | DateStyle=USE_POSTGRES_DATES; |
383 | 390 | EuroDates= FALSE; |
@@ -410,6 +417,9 @@ show_date() |
410 | 417 | caseUSE_SQL_DATES: |
411 | 418 | strcat(buf,"SQL"); |
412 | 419 | break; |
| 420 | +caseUSE_GERMAN_DATES: |
| 421 | +strcat(buf,"German"); |
| 422 | +break; |
413 | 423 | default: |
414 | 424 | strcat(buf,"Postgres"); |
415 | 425 | break; |
|
