*** org/postgresql/jdbc2/ResultSet.java_7.2b4	Tue Dec 11 13:48:05 2001
--- org/postgresql/jdbc2/ResultSet.java	Tue Jan 15 19:15:05 2002
***************
*** 1579,1589 ****
  	{
  		if (s == null)
  			return null; // SQL NULL
! 		// length == 8: SQL Time
! 		// length >  8: SQL Timestamp
  		try
  		{
! 			return java.sql.Time.valueOf((s.length() == 8) ? s : s.substring(11, 19));
  		}
  		catch (NumberFormatException e)
  		{
--- 1579,1602 ----
  	{
  		if (s == null)
  			return null; // SQL NULL
! 
! 		// 2002-01-15 17:22:41.863506+09  timestamp with time zone
! 		// 2002-01-15 17:22:41+09         timestamp(0) with time zone
! 		// 2002-01-15 17:25:11.451415     timestamp without time zone
! 		// 2002-01-15 17:25:11            timestamp(0) without time zone
! 		// 17:25:39.731669                time without time zone
! 		// 17:25:39                       time(0) without time zone
! 		// 17:26:27.537975+09             time with time zone
! 		// 17:26:27+09                    time(0) with time zone
! 
! 		String hhmmss;
! 		if (19 <= s.length() && s.charAt(10) == ' ')
! 			hhmmss = s.substring(11, 19);
! 		else
! 			hhmmss = s.substring(0, 8);
  		try
  		{
! 			return Time.valueOf(hhmmss);
  		}
  		catch (NumberFormatException e)
  		{