From e29a4f63aae8f13a39e273e520d530f0785f7fbd Mon Sep 17 00:00:00 2001 From: fanxt0218 <3515228784@qq.com> Date: Thu, 19 Jun 2025 12:10:05 +0800 Subject: [PATCH 1/4] Oracle: add OracleChatMemory support Signed-off-by: fanxt0218 <3515228784@qq.com> --- .../jdbc/JdbcChatMemoryRepositoryDialect.java | 3 ++ .../OracleChatMemoryRepositoryDialect.java | 47 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java index 526c0908c77..6de842bd01d 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java @@ -71,6 +71,9 @@ static JdbcChatMemoryRepositoryDialect from(DataSource dataSource) { if (url.contains("hsqldb")) { return new HsqldbChatMemoryRepositoryDialect(); } + if (url.contains("oracle")) { + return new OracleChatMemoryRepositoryDialect(); + } // Add more as needed } catch (Exception ignored) { diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java new file mode 100644 index 00000000000..657d863eb73 --- /dev/null +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java @@ -0,0 +1,47 @@ +/* + * Copyright 2024-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.ai.chat.memory.repository.jdbc; + +/** + * Dialect for Oracle. + * + * @author Xiaotong Fan + * @since 1.1.0 + */ + +public class OracleChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect { + @Override + public String getSelectMessagesSql() { + return "SELECT content, type FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ? ORDER BY \"timestamp\""; + } + + @Override + public String getInsertMessageSql() { + return "INSERT INTO SPRING_AI_CHAT_MEMORY (conversation_id, content, type, \"timestamp\") VALUES (?, ?, ?, ?)"; + } + + @Override + public String getSelectConversationIdsSql() { + return "SELECT DISTINCT conversation_id FROM SPRING_AI_CHAT_MEMORY"; + } + + @Override + public String getDeleteMessagesSql() { + return "DELETE FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ?"; + } + +} From 5b62ffe17658ce9d9dfa42dd72b58b132c348a01 Mon Sep 17 00:00:00 2001 From: fanxt0218 <3515228784@qq.com> Date: Fri, 20 Jun 2025 14:32:25 +0800 Subject: [PATCH 2/4] add Oracle schema and corresponding integration test Signed-off-by: fanxt0218 <3515228784@qq.com> --- .../pom.xml | 16 +++++++++ .../memory/repository/jdbc/schema-oracle.sql | 9 +++++ .../JdbcChatMemoryRepositoryBuilderTests.java | 18 ++++++++++ .../JdbcChatMemoryRepositoryOracleIT.java | 34 +++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/resources/org/springframework/ai/chat/memory/repository/jdbc/schema-oracle.sql create mode 100644 memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/pom.xml b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/pom.xml index 75db46a8e1a..8b57633f92e 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/pom.xml +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/pom.xml @@ -88,6 +88,14 @@ true + + + com.oracle.database.jdbc + ojdbc8 + 21.13.0.0 + test + + org.springframework.boot spring-boot-starter-test @@ -100,6 +108,14 @@ test + + + org.testcontainers + oracle-xe + 1.19.0 + test + + org.testcontainers postgresql diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/resources/org/springframework/ai/chat/memory/repository/jdbc/schema-oracle.sql b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/resources/org/springframework/ai/chat/memory/repository/jdbc/schema-oracle.sql new file mode 100644 index 00000000000..d245ea65b48 --- /dev/null +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/resources/org/springframework/ai/chat/memory/repository/jdbc/schema-oracle.sql @@ -0,0 +1,9 @@ +CREATE TABLE SPRING_AI_CHAT_MEMORY ( + conversation_id VARCHAR2(36) NOT NULL, + content CLOB NOT NULL, + type VARCHAR2(10) NOT NULL CHECK (type IN ('USER', 'ASSISTANT', 'SYSTEM', 'TOOL')), + "timestamp" TIMESTAMP NOT NULL +); + +CREATE INDEX idx_conversation_id ON SPRING_AI_CHAT_MEMORY(conversation_id); +CREATE INDEX idx_conversation_id_timestamp ON SPRING_AI_CHAT_MEMORY(conversation_id, "timestamp"); \ No newline at end of file diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryBuilderTests.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryBuilderTests.java index 87dbfa5f03b..80f6a97f156 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryBuilderTests.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryBuilderTests.java @@ -37,6 +37,7 @@ * * @author Mark Pollack * @author Yanming Zhou + * @author Xiaotong Fan */ public class JdbcChatMemoryRepositoryBuilderTests { @@ -136,6 +137,23 @@ void testBuilderWithHsqldbDialectFromDataSource() throws SQLException { assertThat(repository).isNotNull(); } + @Test + void testBuilderWithOracleDialectFromDataSource() throws SQLException { + // Setup mocks for Oracle + DataSource dataSource = mock(DataSource.class); + Connection connection = mock(Connection.class); + DatabaseMetaData metaData = mock(DatabaseMetaData.class); + + when(dataSource.getConnection()).thenReturn(connection); + when(connection.getMetaData()).thenReturn(metaData); + when(metaData.getURL()).thenReturn("jdbc:oracle:thin:@//192.168.19.129:1521/ORCL"); + + // Test with dialect from datasource + JdbcChatMemoryRepository repository = JdbcChatMemoryRepository.builder().dataSource(dataSource).build(); + + assertThat(repository).isNotNull(); + } + @Test void testBuilderWithUnknownDialectFromDataSource() throws SQLException { // Setup mocks for unknown database diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java new file mode 100644 index 00000000000..a2db77b3eda --- /dev/null +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java @@ -0,0 +1,34 @@ +/* + * Copyright 2023-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.ai.chat.memory.repository.jdbc; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.jdbc.Sql; + +/** + * Integration tests for {@link JdbcChatMemoryRepository} with Oracle. + * + * @author Xiaotong Fan + */ + +@SpringBootTest +@TestPropertySource(properties = {"spring.datasource.url=jdbc:tc:oracle:21.3.0.0:///"}) +@Sql(scripts = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-oracle.sql") +public class JdbcChatMemoryRepositoryOracleIT extends AbstractJdbcChatMemoryRepositoryIT{ + +} From b1026d994929608ea55df6acdf0960c016882327 Mon Sep 17 00:00:00 2001 From: fanxt0218 <3515228784@qq.com> Date: Fri, 20 Jun 2025 21:03:46 +0800 Subject: [PATCH 3/4] add the extendedMethod define Signed-off-by: fanxt0218 <3515228784@qq.com> --- .../jdbc/OracleChatMemoryRepositoryDialect.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java index 657d863eb73..210a8d03c0a 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java @@ -44,4 +44,12 @@ public String getDeleteMessagesSql() { return "DELETE FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ?"; } + /** + * This method requires uncommenting the Override annotation after the interface defines the method + */ + //@Override + public String getDeleteAllMessageSql() { + return "DELETE FROM SPRING_AI_CHAT_MEMORY"; + } + } From beaf0477b8d062648f87ddc2da26ecb20ccebb5c Mon Sep 17 00:00:00 2001 From: fanxt0218 <3515228784@qq.com> Date: Sat, 21 Jun 2025 11:41:17 +0800 Subject: [PATCH 4/4] fix the error: javaformat error(run spring-javaformat:apply) Signed-off-by: fanxt0218 <3515228784@qq.com> --- .../repository/jdbc/OracleChatMemoryRepositoryDialect.java | 6 ++++-- .../repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java index 210a8d03c0a..71708c21d63 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/OracleChatMemoryRepositoryDialect.java @@ -24,6 +24,7 @@ */ public class OracleChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect { + @Override public String getSelectMessagesSql() { return "SELECT content, type FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ? ORDER BY \"timestamp\""; @@ -45,9 +46,10 @@ public String getDeleteMessagesSql() { } /** - * This method requires uncommenting the Override annotation after the interface defines the method + * This method requires uncommenting the Override annotation after the interface + * defines the method */ - //@Override + // @Override public String getDeleteAllMessageSql() { return "DELETE FROM SPRING_AI_CHAT_MEMORY"; } diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java index a2db77b3eda..7ed889c7430 100644 --- a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java +++ b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryOracleIT.java @@ -27,8 +27,8 @@ */ @SpringBootTest -@TestPropertySource(properties = {"spring.datasource.url=jdbc:tc:oracle:21.3.0.0:///"}) +@TestPropertySource(properties = { "spring.datasource.url=jdbc:tc:oracle:21.3.0.0:///" }) @Sql(scripts = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-oracle.sql") -public class JdbcChatMemoryRepositoryOracleIT extends AbstractJdbcChatMemoryRepositoryIT{ +public class JdbcChatMemoryRepositoryOracleIT extends AbstractJdbcChatMemoryRepositoryIT { }