Add DatabaseType POSTGRES for the product name EnterpriseDB spring-pr…

…ojects#4627 Added one test Since PostGres EnterpriseDB driver and test container is not available, not written integration test
sheelprabhakar · Jun 29, 2024 · 479cbb6 · 479cbb6
1 parent 425134c
commit 479cbb6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...ng-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java b/...ng-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java
@@ -102,8 +102,9 @@ else if (databaseProductName.contains("AS") && (databaseProductVersion.startsWit
 			else {
 				databaseProductName = JdbcUtils.commonDatabaseName(databaseProductName);
 			}
-		}
-		else {
+		} else if (StringUtils.hasText(databaseProductName) && databaseProductName.startsWith("EnterpriseDB")) {
+			databaseProductName = "PostgreSQL";
+		} else {
 			databaseProductName = JdbcUtils.commonDatabaseName(databaseProductName);
 		}
 		return fromProductName(databaseProductName);

diff --git a/...tch-infrastructure/src/test/java/org/springframework/batch/support/DatabaseTypeTests.java b/...tch-infrastructure/src/test/java/org/springframework/batch/support/DatabaseTypeTests.java
@@ -138,6 +138,13 @@ void testFromMetaDataForPostgres() throws Exception {
 		assertEquals(POSTGRES, DatabaseType.fromMetaData(ds));
 	}
 
+	@Test
+	void testFromMetaDataForEnterpriseDB() throws Exception {
+		DataSource ds = DatabaseTypeTestUtils.getMockDataSource("EnterpriseDB");
+		// Should return POSTGRES
+		assertEquals(POSTGRES, DatabaseType.fromMetaData(ds));
+	}
+
 	@Test
 	void testFromMetaDataForSybase() throws Exception {
 		DataSource ds = DatabaseTypeTestUtils.getMockDataSource("Adaptive Server Enterprise");