Index: src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java,v
retrieving revision 1.18
diff -u -c -r1.18 DatabaseMetaDataTest.java
*** src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java	29 May 2003 04:39:48 -0000	1.18
--- src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java	17 Nov 2003 01:12:39 -0000
***************
*** 52,79 ****
  			ResultSet rs = dbmd.getTables( null, null, "testmetadat%", new String[] {"TABLE"});
  			assertTrue( rs.next() );
  			String tableName = rs.getString("TABLE_NAME");
! 			assertTrue( tableName.equals("testmetadata") );
  			String tableType = rs.getString("TABLE_TYPE");
! 			assertTrue( tableType.equals("TABLE") );
              //There should only be one row returned 
              assertTrue( "getTables() returned too many rows", rs.next() == false);
  			rs.close();
  
  			rs = dbmd.getColumns("", "", "test%", "%" );
  			assertTrue( rs.next() );
! 			assertTrue( rs.getString("TABLE_NAME").equals("testmetadata") );
! 			assertTrue( rs.getString("COLUMN_NAME").equals("id") );
! 			assertTrue( rs.getInt("DATA_TYPE") == java.sql.Types.INTEGER );
  
  			assertTrue( rs.next() );
! 			assertTrue( rs.getString("TABLE_NAME").equals("testmetadata") );
! 			assertTrue( rs.getString("COLUMN_NAME").equals("name") );
! 			assertTrue( rs.getInt("DATA_TYPE") == java.sql.Types.VARCHAR );
  
  			assertTrue( rs.next() );
! 			assertTrue( rs.getString("TABLE_NAME").equals("testmetadata") );
! 			assertTrue( rs.getString("COLUMN_NAME").equals("updated") );
! 			assertTrue( rs.getInt("DATA_TYPE") == java.sql.Types.TIMESTAMP );
  
  		}
  		catch (SQLException ex)
--- 52,79 ----
  			ResultSet rs = dbmd.getTables( null, null, "testmetadat%", new String[] {"TABLE"});
  			assertTrue( rs.next() );
  			String tableName = rs.getString("TABLE_NAME");
! 			assertEquals( "testmetadata", tableName );
  			String tableType = rs.getString("TABLE_TYPE");
! 			assertEquals( "TABLE", tableType );
              //There should only be one row returned 
              assertTrue( "getTables() returned too many rows", rs.next() == false);
  			rs.close();
  
  			rs = dbmd.getColumns("", "", "test%", "%" );
  			assertTrue( rs.next() );
! 			assertEquals( "testmetadata", rs.getString("TABLE_NAME") );
! 			assertEquals( "id", rs.getString("COLUMN_NAME") );
! 			assertEquals( java.sql.Types.INTEGER, rs.getInt("DATA_TYPE") );
  
  			assertTrue( rs.next() );
! 			assertEquals( "testmetadata", rs.getString("TABLE_NAME") );
! 			assertEquals( "name", rs.getString("COLUMN_NAME") );
! 			assertEquals( java.sql.Types.VARCHAR, rs.getInt("DATA_TYPE") );
  
  			assertTrue( rs.next() );
! 			assertEquals( "testmetadata", rs.getString("TABLE_NAME") );
! 			assertEquals( "updated", rs.getString("COLUMN_NAME") );
! 			assertEquals( java.sql.Types.TIMESTAMP, rs.getInt("DATA_TYPE") );
  
  		}
  		catch (SQLException ex)
***************
*** 102,114 ****
  			{
  
  				String pkTableName = rs.getString( "PKTABLE_NAME" );
! 				assertTrue ( pkTableName.equals("vv") );
  
  				String pkColumnName = rs.getString( "PKCOLUMN_NAME" );
  				assertTrue( pkColumnName.equals("a") || pkColumnName.equals("b"));
  
  				String fkTableName = rs.getString( "FKTABLE_NAME" );
! 				assertTrue( fkTableName.equals( "ww" ) );
  
  				String fkColumnName = rs.getString( "FKCOLUMN_NAME" );
  				assertTrue( fkColumnName.equals( "m" ) || fkColumnName.equals( "n" ) ) ;
--- 102,114 ----
  			{
  
  				String pkTableName = rs.getString( "PKTABLE_NAME" );
! 				assertEquals ( "vv", pkTableName );
  
  				String pkColumnName = rs.getString( "PKCOLUMN_NAME" );
  				assertTrue( pkColumnName.equals("a") || pkColumnName.equals("b"));
  
  				String fkTableName = rs.getString( "FKTABLE_NAME" );
! 				assertEquals( "ww", fkTableName );
  
  				String fkColumnName = rs.getString( "FKCOLUMN_NAME" );
  				assertTrue( fkColumnName.equals( "m" ) || fkColumnName.equals( "n" ) ) ;
***************
*** 121,130 ****
  				}
  
  				String pkName = rs.getString( "PK_NAME" );
! 				assertTrue( pkName.equals("vv_pkey") );
  
  				int keySeq = rs.getInt( "KEY_SEQ" );
! 				assertTrue( keySeq == j );
  			}
  
  
--- 121,130 ----
  				}
  
  				String pkName = rs.getString( "PK_NAME" );
! 				assertEquals( "vv_pkey", pkName );
  
  				int keySeq = rs.getInt( "KEY_SEQ" );
! 				assertEquals( j, keySeq );
  			}
  
  
***************
*** 162,171 ****
  				assertTrue ( pkTableName.equals("people") || pkTableName.equals("policy") );
  
  				String pkColumnName = rs.getString( "PKCOLUMN_NAME" );
! 				assertTrue( pkColumnName.equals("id") );
  
  				String fkTableName = rs.getString( "FKTABLE_NAME" );
! 				assertTrue( fkTableName.equals( "users" ) );
  
  				String fkColumnName = rs.getString( "FKCOLUMN_NAME" );
  				assertTrue( fkColumnName.equals( "people_id" ) || fkColumnName.equals( "policy_id" ) ) ;
--- 162,171 ----
  				assertTrue ( pkTableName.equals("people") || pkTableName.equals("policy") );
  
  				String pkColumnName = rs.getString( "PKCOLUMN_NAME" );
! 				assertEquals( "id", pkColumnName );
  
  				String fkTableName = rs.getString( "FKTABLE_NAME" );
! 				assertEquals( "users", fkTableName );
  
  				String fkColumnName = rs.getString( "FKCOLUMN_NAME" );
  				assertTrue( fkColumnName.equals( "people_id" ) || fkColumnName.equals( "policy_id" ) ) ;
***************
*** 185,195 ****
  			// this is hacky, but it will serve the purpose
  			assertTrue ( rs.next() );
  
! 			assertTrue( rs.getString( "PKTABLE_NAME" ).equals( "people" ) );
! 			assertTrue( rs.getString( "PKCOLUMN_NAME" ).equals( "id" ) );
  
! 			assertTrue( rs.getString( "FKTABLE_NAME" ).equals( "users" ) );
! 			assertTrue( rs.getString( "FKCOLUMN_NAME" ).equals( "people_id" ) );
  
  			assertTrue( rs.getString( "FK_NAME" ).startsWith( "people" ) );
  
--- 185,195 ----
  			// this is hacky, but it will serve the purpose
  			assertTrue ( rs.next() );
  
! 			assertEquals( "people", rs.getString( "PKTABLE_NAME" ) );
! 			assertEquals( "id", rs.getString( "PKCOLUMN_NAME" ) );
  
! 			assertEquals( "users", rs.getString( "FKTABLE_NAME" ) );
! 			assertEquals( "people_id", rs.getString( "FKCOLUMN_NAME" ) );
  
  			assertTrue( rs.getString( "FK_NAME" ).startsWith( "people" ) );