changeset 148:db5fa40cfa31

Update program to list the productversion only when it is lower than 11.27.1 This makes the output stable for future releases.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 17 Aug 2017 17:18:18 +0200 (2017-08-17)
parents ad0fe5b04fd4
children 1e49fc74dba4
files tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.java
diffstat 1 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.java
+++ b/tests/Bug_Connect_as_voc_getMetaData_Failure_Bug_6388.java
@@ -27,6 +27,7 @@ public class Bug_Connect_as_voc_getMetaD
 			System.out.println("3. ALTER USER voc");
 			stmt1.executeUpdate("ALTER USER \"voc\" SET SCHEMA \"voc\"");
 			System.out.println("creation succeeded :)");
+			System.out.println();
 
 			login_as_voc_and_get_MetaData(args[0].replace("=monetdb", "=voc"));
 
@@ -69,27 +70,30 @@ public class Bug_Connect_as_voc_getMetaD
 			System.out.println("MaxConnections = " + dbmd.getMaxConnections());
 
 			System.out.println("4.4. getDatabaseProductVersion()");
-			System.out.println("DatabaseProductVersion = " + dbmd.getDatabaseProductVersion());
+			String dbmsVersion = dbmd.getDatabaseProductVersion();	// should be 11.27.1 or higher
+			boolean postJul2017 = ("11.27.1".compareTo(dbmsVersion) <= 0);
+			System.out.println("DatabaseProductVersion = " + (postJul2017 ? "11.27.+" : dbmsVersion));
 
 			System.out.println("4.5. getDatabaseMajorVersion()");
-			System.out.println("DatabaseMajorVersion = " + dbmd.getDatabaseMajorVersion());
+			System.out.println("DatabaseMajorVersion = " + dbmd.getDatabaseMajorVersion());	// should be 11
 
 			System.out.println("4.6. getDatabaseMinorVersion()");
-			System.out.println("DatabaseMinorVersion = " + dbmd.getDatabaseMinorVersion());
+			int dbmsMinorVersion = dbmd.getDatabaseMinorVersion();	// should be 27 or higher
+			System.out.println("DatabaseMinorVersion = " + (dbmsMinorVersion >= 27 ? "27+" : dbmsMinorVersion));
 
 			System.out.println("4.7. getTables(null, 'tmp', null, null)");
-			ResultSet rs2 = dbmd.getTables(null, "tmp", null, null);
-			if (rs2 != null) {
+			ResultSet rs1 = dbmd.getTables(null, "tmp", null, null);
+			if (rs1 != null) {
 				System.out.println("List Tables in schema tmp:");
-				while (rs2.next()) {
-					System.out.println(rs2.getString(3));
+				while (rs1.next()) {
+					System.out.println(rs1.getString(3));
 				}
-				rs2.close();
+				rs1.close();
 			}
 			System.out.println("completed listing Tables in schema tmp");
 
 			System.out.println("4.8. getTableTypes()");
-			ResultSet rs1 = dbmd.getTableTypes();
+			rs1 = dbmd.getTableTypes();
 			if (rs1 != null) {
 				System.out.println("List TableTypes:");
 				while (rs1.next()) {