Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main.slony.info:/tmp/cvs-serv2081

Modified Files:
	slony1_funcs.c 
Log Message:
Per Yoshiharu Mori <y-mori at sraoss.co.jp>

Only use set_config_option() to set datestyle if we're using other than "ISO"

http://lists.slony.info/pipermail/slony1-hackers/2008-March/000132.html


Index: slony1_funcs.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** slony1_funcs.c	11 Dec 2007 19:30:29 -0000	1.63
--- slony1_funcs.c	27 Mar 2008 15:01:54 -0000	1.64
***************
*** 443,447 ****
  		need_comma = false;
  		OldDateStyle=GetConfigOptionByName("DateStyle", NULL);
! 		set_config_option("DateStyle", "ISO", PGC_USERSET, PGC_S_SESSION, true, true);
  		for (i = 0; i < tg->tg_relation->rd_att->natts; i++)
  		{
--- 443,448 ----
  		need_comma = false;
  		OldDateStyle=GetConfigOptionByName("DateStyle", NULL);
! 		if (!strstr(OldDateStyle,"ISO"))
! 			set_config_option("DateStyle", "ISO", PGC_USERSET, PGC_S_SESSION, true, true);
  		for (i = 0; i < tg->tg_relation->rd_att->natts; i++)
  		{
***************
*** 483,487 ****
  		}
  
! 		set_config_option("DateStyle", OldDateStyle, PGC_USERSET, PGC_S_SESSION, true, true);
  
  		/*
--- 484,489 ----
  		}
  
! 		if (!strstr(OldDateStyle,"ISO"))
! 			set_config_option("DateStyle", OldDateStyle, PGC_USERSET, PGC_S_SESSION, true, true);
  
  		/*
***************
*** 607,613 ****
  			{
  				OldDateStyle=GetConfigOptionByName("DateStyle", NULL);
! 				set_config_option("DateStyle", "ISO", PGC_USERSET, PGC_S_SESSION, true, true);
  				col_value = slon_quote_literal(SPI_getvalue(new_row, tupdesc, i + 1));
! 				set_config_option("DateStyle", OldDateStyle, PGC_USERSET, PGC_S_SESSION, true, true);
  			}
  			cmddata_need = (cp - (char *)(cs->cmddata_buf)) + 16 +
--- 609,617 ----
  			{
  				OldDateStyle=GetConfigOptionByName("DateStyle", NULL);
! 				if (!strstr(OldDateStyle,"ISO"))
! 					set_config_option("DateStyle", "ISO", PGC_USERSET, PGC_S_SESSION, true, true);
  				col_value = slon_quote_literal(SPI_getvalue(new_row, tupdesc, i + 1));
! 				if (!strstr(OldDateStyle,"ISO"))
! 					set_config_option("DateStyle", OldDateStyle, PGC_USERSET, PGC_S_SESSION, true, true);
  			}
  			cmddata_need = (cp - (char *)(cs->cmddata_buf)) + 16 +