diff src/main/java/org/monetdb/jdbc/MonetDriver.java @ 786:f7df78989ac5

Generate MonetVersion.java rather than MonetDriver.java MonetDriver.java also contains code, MonetVersion only the generated values.
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Fri, 30 Jun 2023 11:55:48 +0200 (21 months ago)
parents src/main/java/org/monetdb/jdbc/MonetDriver.java.in@e00866975421
children 2f36ac68ac35 4c35009cd59c
line wrap: on
line diff
copy from src/main/java/org/monetdb/jdbc/MonetDriver.java.in
copy to src/main/java/org/monetdb/jdbc/MonetDriver.java
--- a/src/main/java/org/monetdb/jdbc/MonetDriver.java.in
+++ b/src/main/java/org/monetdb/jdbc/MonetDriver.java
@@ -158,7 +158,8 @@ public final class MonetDriver implement
 	 */
 	@Override
 	public int getMajorVersion() {
-		return @JDBC_MAJOR@;
+		// defer to the static version of this method
+		return getDriverMajorVersion();
 	}
 
 	/**
@@ -168,7 +169,8 @@ public final class MonetDriver implement
 	 */
 	@Override
 	public int getMinorVersion() {
-		return @JDBC_MINOR@;
+		// defer to the static version of this method
+		return getDriverMinorVersion();
 	}
 
 	/**
@@ -306,7 +308,8 @@ public final class MonetDriver implement
 	 * @return MonetDB JDBC Driver major version number
 	 */
 	static final int getDriverMajorVersion() {
-		return @JDBC_MAJOR@;
+		// defer to the generated MonetVersion class
+		return MonetVersion.majorVersion;
 	}
 
 	/**
@@ -315,7 +318,8 @@ public final class MonetDriver implement
 	 * @return MonetDB JDBC Driver minor version number
 	 */
 	static final int getDriverMinorVersion() {
-		return @JDBC_MINOR@;
+		// defer to the generated MonetVersion class
+		return MonetVersion.minorVersion;
 	}
 
 	/**
@@ -324,7 +328,7 @@ public final class MonetDriver implement
 	 * @return the version string
 	 */
 	public static final String getDriverVersion() {
-		return "@JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@)";
+		return MonetVersion.driverVersion;
 	}
 
 	/** A static Map containing the mapping between MonetDB types and Java SQL types */