Add DbType enum and update ConnectionManager for database type handling

Author: BenCodez

SimpleAPI/src/main/java/com/bencodez/simpleapi/sql/mysql/AbstractSqlTable.java

@@ -14,15 +14,19 @@ public class ConnectionManager {
 	@Getter
 	@Setter
 	private int connectionTimeout = 50_000;
+
 	@Getter
 	@Setter
 	private String database;
+
 	@Getter
 	@Setter
 	private HikariDataSource dataSource;
+
 	@Getter
 	@Setter
 	private String host;
+
 	@Getter
 	@Setter
 	private int maximumPoolsize = 5;
@@ -50,24 +54,43 @@ public class ConnectionManager {
 	@Getter
 	@Setter
 	private String password;
+
 	@Getter
 	@Setter
 	private String port;
+
 	@Getter
 	@Setter
 	private boolean publicKeyRetrieval;
+
+	/**
+	 * Extra JDBC params appended to URL.
+	 *
+	 * MySQL/MariaDB: should generally start with "&" if adding params. Postgres:
+	 * can be "?foo=bar" or "&foo=bar" or "foo=bar" (we normalize).
+	 */
 	@Getter
 	@Setter
 	private String str = "";
+
 	@Getter
 	@Setter
 	private String username;
+
 	@Getter
 	@Setter
 	private boolean useSSL = false;
+
+	/**
+	 * Legacy flag still supported; only used if dbType isn't explicitly set.
+	 */
 	@Getter
 	@Setter
 	private boolean useMariaDB = false;
+
+	/**
+	 * Optional explicit driver override. If empty, chosen based on dbType.
+	 */
 	@Getter
 	@Setter
 	private String mysqlDriver = "";
@@ -76,6 +99,13 @@ public class ConnectionManager {
 	@Setter
 	private String poolName = "SimpleAPI-Hikari";
 
+	/**
+	 * NEW: Explicit database type.
+	 */
+	@Getter
+	@Setter
+	private DbType dbType = DbType.MYSQL;
+
 	public ConnectionManager(String host, String port, String username, String password, String database) {
 		this.host = host;
 		this.port = port;
@@ -94,6 +124,8 @@ public ConnectionManager(String host, String port, String username, String passw
 		this.str = (str == null ? "" : str);
 		this.publicKeyRetrieval = publicKeyRetrieval;
 		this.useMariaDB = useMariaDB;
+		// temporary backward compatibility
+		this.dbType = useMariaDB ? DbType.MARIADB : DbType.MYSQL;
 	}
 
 	public boolean isClosed() {
@@ -119,46 +151,95 @@ public Connection getConnection() {
 		}
 	}
 
-	private String getMysqlDriverName() {
-		String className = useMariaDB ? "org.mariadb.jdbc.Driver" : "com.mysql.cj.jdbc.Driver";
-		try {
-			Class.forName(className);
-		} catch (ClassNotFoundException ignored) {
+	private void ensureDriverPresent(String className) throws ClassNotFoundException {
+		Class.forName(className);
+	}
+
+	private String resolveDriver() throws ClassNotFoundException {
+		// Allow explicit override (keeps field name mysqlDriver for minimal churn)
+		if (mysqlDriver != null && !mysqlDriver.isEmpty()) {
+			ensureDriverPresent(mysqlDriver);
+			return mysqlDriver;
+		}
+
+		String className;
+		switch (dbType) {
+		case POSTGRESQL:
+			className = "org.postgresql.Driver";
+			break;
+		case MARIADB:
+			className = "org.mariadb.jdbc.Driver";
+			break;
+		case MYSQL:
+		default:
 			className = "com.mysql.cj.jdbc.Driver";
-			try {
-				Class.forName(className);
-			} catch (ClassNotFoundException ignored1) {
-				try {
-					className = "com.mysql.jdbc.Driver";
-					Class.forName(className);
-				} catch (ClassNotFoundException ignored2) {
-				}
-			}
+			break;
 		}
+
+		ensureDriverPresent(className);
 		return className;
 	}
 
+	private String buildJdbcUrl(String driverClassName) {
+		String extra = (str == null ? "" : str);
+
+		// Postgres
+		if (dbType == DbType.POSTGRESQL || "org.postgresql.Driver".equals(driverClassName)) {
+			String base = String.format("jdbc:postgresql://%s:%s/%s", host, port, database);
+
+			// Defaults:
+			// - reWriteBatchedInserts improves batch perf
+			// - sslmode if useSSL
+			String defaults = "reWriteBatchedInserts=true";
+			if (useSSL) {
+				defaults += "&sslmode=require";
+			}
+
+			if (extra.isEmpty()) {
+				return base + "?" + defaults;
+			}
+
+			// Normalize user extras:
+			// - "?a=b" => base + "?a=b&defaults"
+			// - "&a=b" => base + "?defaults&a=b"
+			// - "a=b" => base + "?defaults&a=b"
+			if (extra.startsWith("?")) {
+				return base + extra + (extra.endsWith("?") ? "" : "&") + defaults;
+			}
+			if (extra.startsWith("&")) {
+				return base + "?" + defaults + extra;
+			}
+			return base + "?" + defaults + "&" + extra;
+		}
+
+		// MySQL / MariaDB
+		boolean maria = (dbType == DbType.MARIADB) || "org.mariadb.jdbc.Driver".equals(driverClassName);
+		String base = maria ? String.format("jdbc:mariadb://%s:%s/%s", host, port, database)
+				: String.format("jdbc:mysql://%s:%s/%s", host, port, database);
+
+		return base + "?useSSL=" + useSSL + "&allowMultiQueries=true" + "&rewriteBatchedStatements=true"
+				+ "&useDynamicCharsetInfo=false" + "&allowPublicKeyRetrieval=" + publicKeyRetrieval
+				+ "&tcpKeepAlive=true" + "&connectTimeout=10000" + "&socketTimeout=30000" + "&serverTimezone=UTC"
+				+ extra;
+	}
+
 	// --- Pool Configuration ---
 
 	public boolean open() {
-		if (mysqlDriver.isEmpty())
-			mysqlDriver = getMysqlDriverName();
-
 		try {
+			// If someone only set legacy flag but not dbType explicitly, keep it consistent
+			if (dbType == null) {
+				dbType = useMariaDB ? DbType.MARIADB : DbType.MYSQL;
+			}
+
+			String driverClassName = resolveDriver();
+
 			HikariConfig cfg = new HikariConfig();
-			cfg.setDriverClassName(mysqlDriver);
+			cfg.setDriverClassName(driverClassName);
 			cfg.setUsername(username);
 			cfg.setPassword(password);
 
-			String base = (mysqlDriver.equals("org.mariadb.jdbc.Driver"))
-					? String.format("jdbc:mariadb://%s:%s/%s", host, port, database)
-					: String.format("jdbc:mysql://%s:%s/%s", host, port, database);
-
-			String url = base + "?useSSL=" + useSSL + "&allowMultiQueries=true" + "&rewriteBatchedStatements=true"
-					+ "&useDynamicCharsetInfo=false" + "&allowPublicKeyRetrieval=" + publicKeyRetrieval
-					+ "&tcpKeepAlive=true" + "&connectTimeout=10000" + "&socketTimeout=30000" + "&serverTimezone=UTC"
-					+ (str == null ? "" : str);
-			cfg.setJdbcUrl(url);
+			cfg.setJdbcUrl(buildJdbcUrl(driverClassName));
 
 			// Pool sizing
 			int maxPool = Math.max(1, maximumPoolsize);
@@ -174,22 +255,26 @@ public boolean open() {
 			long effectiveIdle = Math.min(idleTimeoutMs, Math.max(1000L, effectiveMaxLife - 60_000L));
 			cfg.setIdleTimeout(effectiveIdle);
 
-			if (keepaliveMs > 0)
+			if (keepaliveMs > 0) {
 				cfg.setKeepaliveTime(keepaliveMs);
-			if (validationMs > 0)
+			}
+			if (validationMs > 0) {
 				cfg.setValidationTimeout(validationMs);
-			if (leakDetectMs > 0)
+			}
+			if (leakDetectMs > 0) {
 				cfg.setLeakDetectionThreshold(leakDetectMs);
+			}
 
 			cfg.setConnectionTestQuery("SELECT 1");
 
+			// Safe common settings; ignored by some drivers (fine)
 			cfg.addDataSourceProperty("cachePrepStmts", true);
 			cfg.addDataSourceProperty("prepStmtCacheSize", 500);
 			cfg.addDataSourceProperty("prepStmtCacheSqlLimit", 2048);
 			cfg.addDataSourceProperty("useServerPrepStmts", true);
 
 			cfg.setAutoCommit(true);
-			cfg.setPoolName("SimpleAPI-Hikari");
+			cfg.setPoolName(poolName != null && !poolName.isEmpty() ? poolName : "SimpleAPI-Hikari");
 
 			dataSource = new HikariDataSource(cfg);
 			return true;

SimpleAPI/src/main/java/com/bencodez/simpleapi/sql/mysql/ConnectionManager.java

@@ -0,0 +1,45 @@
+package com.bencodez.simpleapi.sql.mysql;
+
+import java.util.Locale;
+
+public enum DbType {
+	MYSQL("mysql"),
+	MARIADB("mariadb"),
+	POSTGRESQL("postgresql");
+
+	private final String id;
+
+	DbType(String id) {
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public boolean isMySqlFamily() {
+		return this == MYSQL || this == MARIADB;
+	}
+
+	public static DbType fromString(String value) {
+		if (value == null) {
+			return MYSQL;
+		}
+
+		String v = value.trim().toLowerCase(Locale.ROOT);
+
+		switch (v) {
+		case "mysql":
+			return MYSQL;
+		case "mariadb":
+		case "maria":
+			return MARIADB;
+		case "postgres":
+		case "postgresql":
+		case "pg":
+			return POSTGRESQL;
+		default:
+			throw new IllegalArgumentException("Unknown DbType: " + value);
+		}
+	}
+}

SimpleAPI/src/main/java/com/bencodez/simpleapi/sql/mysql/DbType.java

@@ -44,6 +44,22 @@ public boolean connect(MysqlConfig config) {
 				config.getLifeTime(), // may be <=0 (manager will default)
 				config.getLine() == null ? "" : config.getLine(), config.isPublicKeyRetrieval(), config.isUseMariaDB());
 
+		// NEW: set DB type + optional driver override
+		// MysqlConfig should expose:
+		// - DbType getDbType()
+		// - String getDriver() (can be empty)
+		DbType type = config.getDbType();
+		if (type != null) {
+			connectionManager.setDbType(type);
+		} else {
+			connectionManager.setDbType(config.isUseMariaDB() ? DbType.MARIADB : DbType.MYSQL);
+		}
+
+		String driver = config.getDriver();
+		if (driver != null && !driver.isEmpty()) {
+			connectionManager.setMysqlDriver(driver); // field name kept as mysqlDriver
+		}
+
 		// Apply optional tunables if provided (>0 or explicitly set)
 		if (config.getMinimumIdle() > 0) {
 			connectionManager.setMinimumIdle(config.getMinimumIdle());
@@ -76,10 +92,11 @@ public boolean connect(MysqlConfig config) {
 		// Optional debug output
 		if (config.isDebug()) {
 			if (ok) {
-				debug("MySQL connected. host=" + config.getHostName() + " db=" + config.getDatabase() + " maxPool="
-						+ maxConnections);
+				debug("DB connected. type=" + connectionManager.getDbType() + " host=" + config.getHostName() + " db="
+						+ config.getDatabase() + " maxPool=" + maxConnections);
 			} else {
-				debug("MySQL connection failed. Check host/port/credentials and timeouts.");
+				debug("DB connection failed. type=" + connectionManager.getDbType()
+						+ " Check host/port/credentials and timeouts.");
 			}
 		}