Merge pull request #104 from bivashy/fix/inmemory-query-history-duplicatesf

[Fix] InMemory query history contains duplicates

Author: Maxteabag

sqlit/domains/query/store/memory.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from datetime import datetime
 from typing import Any
 
 from sqlit.domains.query.store.history import QueryHistoryEntry
@@ -39,11 +40,22 @@ def load_all(self) -> list[QueryHistoryEntry]:
         return [QueryHistoryEntry.from_dict(entry) for entry in self._entries]
 
     def save_query(self, connection_name: str, query: str) -> None:
-        self._entries.append({
-            "query": query.strip(),
-            "timestamp": "",
-            "connection_name": connection_name,
-        })
+        query_stripped = query.strip()
+        now = datetime.now().isoformat()
+
+        # Check if query already exists
+        for entry in self._entries:
+            if entry.get("connection_name") == connection_name and entry.get("query", "").strip() == query_stripped:
+                entry["timestamp"] = now
+                break
+        else:
+            self._entries.append(
+                {
+                    "query": query_stripped,
+                    "timestamp": now,
+                    "connection_name": connection_name,
+                }
+            )
 
     def delete_entry(self, connection_name: str, timestamp: str) -> bool:
         return False

tests/ui/test_query_history.py

@@ -7,6 +7,7 @@
 from textual.widgets import OptionList
 
 from sqlit.domains.query.store.history import QueryHistoryEntry
+from sqlit.domains.query.store.memory import InMemoryHistoryStore
 from sqlit.domains.query.ui.screens.query_history import QueryHistoryScreen
 from sqlit.domains.shell.app.main import SSMSTUI
 
@@ -195,6 +196,34 @@ async def test_show_history_for_unsaved_connection_uses_session_history(self) ->
             option_list = screen.query_one("#history-list", OptionList)
             assert option_list.option_count == 1
 
+    @pytest.mark.asyncio
+    async def test_show_history_for_unsaved_connection_with_duplicates(self) -> None:
+        unsaved_conn = create_test_connection("temp-db", "sqlite")
+        history_store = MockHistoryStore()
+        services = build_test_services(
+            connection_store=MockConnectionStore([]),
+            settings_store=MockSettingsStore({"theme": "tokyo-night"}),
+            history_store=history_store,
+        )
+        app = SSMSTUI(services=services)
+
+        async with app.run_test(size=(100, 35)) as pilot:
+            app.current_config = unsaved_conn
+            app._save_query_history(unsaved_conn, "SELECT 1")
+            app._save_query_history(unsaved_conn, "SELECT 1")
+
+            app.action_show_history()
+            await pilot.pause(0.2)
+
+            screen = next(
+                (s for s in app.screen_stack if isinstance(s, QueryHistoryScreen)),
+                None,
+            )
+            assert screen is not None, "History screen should be present"
+
+            option_list = screen.query_one("#history-list", OptionList)
+            assert option_list.option_count == 1
+
     def test_saved_connection_queries_saved(self) -> None:
         saved_conn = create_test_connection("saved-db", "sqlite")
         history_store = MockHistoryStore()