Index: org/postgresql/test/jdbc2/TimestampTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java,v
retrieving revision 1.11
diff -c -p -r1.11 TimestampTest.java
*** org/postgresql/test/jdbc2/TimestampTest.java	29 May 2003 04:39:48 -0000	1.11
--- org/postgresql/test/jdbc2/TimestampTest.java	4 Aug 2003 14:02:26 -0000
*************** public class TimestampTest extends TestC
*** 283,288 ****
--- 283,334 ----
  		}
  		return l_return;
  	}
+ 	
+ 	public void testCalendars()
+ 	{		
+ 		try
+ 		{
+ 			PreparedStatement pstmt = con.prepareStatement("insert into testtimestampwotz values (?)");
+ 			java.util.Calendar local = java.util.Calendar.getInstance();
+ 			ResultSet rs;
+ 			java.sql.Timestamp tmpTimestamp = java.sql.Timestamp.valueOf("1999-12-31 12:00:00");
+ 			
+ 			java.util.TimeZone threeHours = java.util.TimeZone.getDefault();
+ 			threeHours.setRawOffset(local.getTimeZone().getRawOffset()+10800000);
+ 			java.util.Calendar threeHoursCal = java.util.Calendar.getInstance();
+ 			threeHoursCal.setTimeZone(threeHours);
+ 			
+ 			pstmt.setTimestamp(1, tmpTimestamp);
+ 			pstmt.executeUpdate();
+ 			
+ 			pstmt.setTimestamp(1, tmpTimestamp, local);
+ 			pstmt.executeUpdate();
+ 			
+ 			pstmt.setTimestamp(1, tmpTimestamp, threeHoursCal);
+ 			pstmt.executeUpdate();
+ 			
+ 			pstmt.setTimestamp(1, tmpTimestamp, local);
+ 			pstmt.executeUpdate();
+ 			
+ 			rs = con.createStatement().executeQuery("select * from testtimestampwotz");
+ 			
+ 			assertTrue(rs.next());
+ 			assertEquals(tmpTimestamp.getTime(), rs.getTimestamp(1, local).getTime());
+ 			
+ 			assertTrue(rs.next());
+ 			assertEquals(tmpTimestamp.getTime(), rs.getTimestamp(1).getTime());
+ 			
+ 			assertTrue(rs.next());
+ 			assertEquals(java.sql.Timestamp.valueOf("1999-12-31 9:00:00"), rs.getTimestamp(1, local));		
+ 			
+ 			assertTrue(rs.next());
+ 			assertEquals(java.sql.Timestamp.valueOf("1999-12-31 15:00:00"), rs.getTimestamp(1, threeHoursCal));
+ 		}
+ 		catch (SQLException sqle)
+ 		{
+ 			fail(sqle.getMessage());
+ 		}
+ 	}
  
  	private static final java.sql.Timestamp TS1WTZ = getTimestamp(1950, 2, 7, 15, 0, 0, 100000000, "PST");
  	private static final String TS1WTZ_PGFORMAT = "1950-02-07 15:00:00.1-08";
