This commit was manufactured by cvs2svn to create tag 'JayBird_2_0_0'.

ChangeLog

@@ -1,40 +1,3 @@
-2005-11-11 23:53  rrokytskyy
-
-	* client-java/src/etc/: release_notes.html, release_notes.odt,
-	release_notes.pdf:
-
-	updated notes to include XAResource.forget issue
-
-2005-11-10 05:58  sjardine
-
-	* client-java/src/:
-	main/org/firebirdsql/jdbc/FBResultSetMetaData.java,
-	test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java:
-
-	Fixed  getColumnTypeName function to return valid column type.	Add
-	junit test case.
-
-2005-11-04 15:49  rrokytskyy
-
-	* client-java/src/test/org/firebirdsql/jca/TestFBXAResource.java:
-
-	adapted to the change in the isSameRM method
-
-2005-11-04 15:47  rrokytskyy
-
-	* client-java/src/main/org/firebirdsql/gds/impl/:
-	jni/isc_db_handle_impl.java, wire/isc_db_handle_impl.java:
-
-	fixed the issue that rdb_id is the same for the same database
-	object (even with different handles)
-
-2005-11-04 14:27  rrokytskyy
-
-	* client-java/src/etc/: release_notes.html, release_notes.odt,
-	release_notes.pdf:
-
-	updates to release notes
-
 2005-10-29 00:40  rrokytskyy
 
 	* client-java/src/main/org/firebirdsql/:

src/test/org/firebirdsql/jdbc/TestFBResultSetMetaData.java

@@ -65,6 +65,7 @@ public TestFBResultSetMetaData(String testName) {
         super(testName);
     }
 
+
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -140,7 +141,6 @@ public void testResultSetMetaData() throws Exception {
         stmt.close();
         connection.close();
     }
-
     public void testResultSetMetaData2() throws Exception {
         Properties props = new Properties();
         props.putAll(this.getDefaultPropertiesForConnection());
@@ -161,42 +161,4 @@ public void testResultSetMetaData2() throws Exception {
         connection.close();
     }
 
-	public void testColumnTypeName() throws Exception {
-
-		Properties props = new Properties();
-		props.putAll(this.getDefaultPropertiesForConnection());
-		props.put("lc_ctype", "UNICODE_FSS");
-
-		Connection connection = 
-			DriverManager.getConnection(this.getUrl(), props);
-
-		Statement stmt = connection.createStatement();
-
-		ResultSet rs = stmt.executeQuery(TEST_QUERY);
-
-		ResultSetMetaData metaData = rs.getMetaData();
-
-		assertTrue("simple_field must be of type VARCHAR",
-				metaData.getColumnTypeName(1).equals("VARCHAR"));
-
-		assertTrue("two_byte_field must be of type VARCHAR",
-				metaData.getColumnTypeName(2).equals("VARCHAR"));
-
-		assertTrue("three_byte_field must be of type VARCHAR",
-				metaData.getColumnTypeName(3).equals("VARCHAR"));
-
-		assertTrue("long_field must be of type NUMERIC",
-				metaData.getColumnTypeName(4).equals("NUMERIC"));
-
-		assertTrue("int_field must be of type NUMERIC",
-				metaData.getColumnTypeName(5).equals("NUMERIC"));
-
-		assertTrue("short_field must be of type NUMERIC",
-				metaData.getColumnTypeName(6).equals("NUMERIC"));
-
-		stmt.close();
-		connection.close();
-
-	}
-
 }