fix: wrong dependency for databasedriver and polish

Signed-off-by: Xavier Chopin <[email protected]>

Author: xchopin

memory/spring-ai-model-chat-memory-jdbc/pom.xml

@@ -46,8 +46,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jdbc</artifactId>
 		</dependency>
 
 		<dependency>

memory/spring-ai-model-chat-memory-jdbc/src/main/java/org/springframework/ai/chat/memory/jdbc/JdbcChatMemory.java

@@ -60,7 +60,7 @@ SELECT TOP (?) content, type, [timestamp] \
     	    WHERE conversation_id = ? \
     	    ORDER BY [timestamp] DESC \
     	  ) AS recent \
-    	 ORDER BY [timestamp] ASC \
+    	 ORDER BY [timestamp] ASC
 	""";
 
 	private static final String QUERY_CLEAR = "DELETE FROM ai_chat_memory WHERE conversation_id = ?";
@@ -71,7 +71,7 @@ SELECT TOP (?) content, type, [timestamp] \
 
 	public JdbcChatMemory(JdbcChatMemoryConfig config) {
 		this.jdbcTemplate = config.getJdbcTemplate();
-		this.driver = this.detectDialect(this.jdbcTemplate);
+		this.driver = this.detectDatabaseDriver(this.jdbcTemplate);
 	}
 
 	public static JdbcChatMemory create(JdbcChatMemoryConfig config) {
@@ -130,15 +130,14 @@ public Message mapRow(ResultSet rs, int i) throws SQLException {
 
 	}
 
-	private DatabaseDriver detectDialect(JdbcTemplate jdbcTemplate) {
+	private DatabaseDriver detectDatabaseDriver(JdbcTemplate jdbcTemplate) {
+		Assert.notNull(jdbcTemplate.getDataSource(), "jdbcTemplate.dataSource must not be null");
 		try {
-			Assert.notNull(jdbcTemplate.getDataSource(), "jdbcTemplate.dataSource must not be null");
-			try (Connection conn = jdbcTemplate.getDataSource().getConnection()) {
-				String url = conn.getMetaData().getURL();
-				return DatabaseDriver.fromJdbcUrl(url);
-			}
+			Connection conn = jdbcTemplate.getDataSource().getConnection();
+			String url = conn.getMetaData().getURL();
+			return DatabaseDriver.fromJdbcUrl(url);
 		} catch (SQLException ex) {
-			throw new IllegalStateException("Impossible to detect dialect", ex);
+			throw new IllegalStateException("Impossible to detect the database driver", ex);
 		}
 	}
 }

memory/spring-ai-model-chat-memory-jdbc/src/test/java/org/springframework/ai/chat/memory/jdbc/JdbcChatMemoryMSSQLServerIT.java

@@ -16,7 +16,6 @@
 
 package org.springframework.ai.chat.memory.jdbc;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -36,11 +35,6 @@
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import javax.sql.DataSource;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.UUID;
@@ -59,38 +53,15 @@ class JdbcChatMemoryMSSQLServerIT {
 			.acceptLicense()
 			.withEnv("MSSQL_PID", "Express")
 			.withEnv("MSSQL_DATABASE", "chat_memory_test")
-			.withPassword("Strong!NotR34LLyPassword");
+			.withPassword("Strong!NotR34LLyPassword")
+			.withInitScript("org/springframework/ai/chat/memory/jdbc/schema-mssql.sql");
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withUserConfiguration(TestApplication.class)
 		.withPropertyValues(String.format("app.datasource.url=%s", mssqlContainer.getJdbcUrl()),
 				String.format("app.datasource.username=%s", mssqlContainer.getUsername()),
 				String.format("app.datasource.password=%s", mssqlContainer.getPassword()));
 
-	@BeforeAll
-	static void initializeSchema() throws Exception {
-		String jdbcUrl = mssqlContainer.getJdbcUrl();
-		String username = mssqlContainer.getUsername();
-		String password = mssqlContainer.getPassword();
-
-		String sql = Files.readString(Path.of(
-				JdbcChatMemoryMSSQLServerIT.class
-						.getClassLoader()
-						.getResource("org/springframework/ai/chat/memory/jdbc/schema-mssql.sql")
-						.toURI()
-		));
-
-		try (Connection conn = DriverManager.getConnection(jdbcUrl, username, password);
-			 Statement stmt = conn.createStatement()) {
-
-			for (String statement : sql.split(";")) {
-				String trimmed = statement.trim();
-				if (!trimmed.isEmpty()) {
-					stmt.execute(trimmed);
-				}
-			}
-		}
-	}
 	@Test
 	void correctChatMemoryInstance() {
 		this.contextRunner.run(context -> {