From 80454f7235a5590b63ca6e22deb143453b2ff7c0 Mon Sep 17 00:00:00 2001 From: Jay Hemnani <193022578+jayhemnani9910@users.noreply.github.com> Date: Tue, 10 Nov 2026 01:03:26 +0530 Subject: [PATCH] Keep RETURNING working through the dialect query analyzer classify_query only looked at the first keyword, so UPDATE ... RETURNING went down the non-query path and SQLite failed on commit. --- .../connections/providers/adapters/base.py | 8 +++++++- sqlit/domains/query/cli/commands.py | 2 ++ tests/unit/test_sqlite_returning.py | 18 +++++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/sqlit/domains/connections/providers/adapters/base.py b/sqlit/domains/connections/providers/adapters/base.py index d7258cdc..9120b226 100644 --- a/sqlit/domains/connections/providers/adapters/base.py +++ b/sqlit/domains/connections/providers/adapters/base.py @@ -2,6 +2,7 @@ from __future__ import annotations +import re from abc import ABC, abstractmethod from dataclasses import dataclass from pathlib import Path @@ -11,6 +12,8 @@ from sqlit.domains.connections.domain.config import ConnectionConfig SELECT_KEYWORDS = frozenset(["SELECT", "WITH", "SHOW", "DESCRIBE", "EXPLAIN", "PRAGMA"]) +_DML_KEYWORDS = frozenset(["INSERT", "UPDATE", "DELETE", "MERGE"]) +_RETURNING_RE = re.compile(r"(?is)\bRETURNING\b\s+\S") def _strip_leading_sql_comments(query: str) -> str: @@ -319,7 +322,10 @@ def test_query(self) -> str: def classify_query(self, query: str) -> bool: """Return True if the query is expected to return rows.""" - return _first_keyword(query) in SELECT_KEYWORDS + keyword = _first_keyword(query) + if keyword in SELECT_KEYWORDS: + return True + return keyword in _DML_KEYWORDS and _RETURNING_RE.search(query) is not None def execute_test_query(self, conn: Any) -> None: """Execute a simple query to verify the connection works. diff --git a/sqlit/domains/query/cli/commands.py b/sqlit/domains/query/cli/commands.py index c348e94c..d0b1ec5c 100644 --- a/sqlit/domains/query/cli/commands.py +++ b/sqlit/domains/query/cli/commands.py @@ -11,6 +11,7 @@ from sqlit.domains.connections.app.session import ConnectionSession from sqlit.domains.connections.cli.prompts import prompt_for_password from sqlit.domains.connections.domain.config import ConnectionConfig +from sqlit.domains.connections.providers.adapters.base import _DML_KEYWORDS, _first_keyword from sqlit.domains.query.app.query_service import ( DialectQueryAnalyzer, QueryKind, @@ -59,6 +60,7 @@ def _should_stream_results( max_rows is None and fmt in ("csv", "json") and analyzer.classify(query) == QueryKind.RETURNS_ROWS + and _first_keyword(query) not in _DML_KEYWORDS and has_cursor ) diff --git a/tests/unit/test_sqlite_returning.py b/tests/unit/test_sqlite_returning.py index bb58850d..98647433 100644 --- a/tests/unit/test_sqlite_returning.py +++ b/tests/unit/test_sqlite_returning.py @@ -8,7 +8,8 @@ import pytest from sqlit.domains.connections.providers.sqlite.adapter import SQLiteAdapter -from sqlit.domains.query.app.query_service import KeywordQueryAnalyzer, QueryKind +from sqlit.domains.query.app.query_service import DialectQueryAnalyzer, KeywordQueryAnalyzer, QueryKind +from sqlit.domains.query.cli.commands import _should_stream_results @pytest.fixture @@ -42,6 +43,21 @@ def test_classifier_recognizes_delete_returning_as_returns_rows(): assert analyzer.classify(sql) == QueryKind.RETURNS_ROWS +def test_dialect_classifier_recognizes_returning(): + """The analyzer real queries go through asks the adapter, not the keyword fallback.""" + analyzer = DialectQueryAnalyzer(SQLiteAdapter()) + assert analyzer.classify("UPDATE jobs SET status = 'x' RETURNING id") == QueryKind.RETURNS_ROWS + assert analyzer.classify("UPDATE jobs SET status = 'x'") == QueryKind.NON_QUERY + + +def test_cli_does_not_stream_dml_returning(): + """Streaming skips the commit, so a write must take the normal path.""" + analyzer = DialectQueryAnalyzer(SQLiteAdapter()) + kwargs = {"max_rows": None, "fmt": "json", "analyzer": analyzer, "has_cursor": True} + assert not _should_stream_results(query="UPDATE jobs SET status = 'x' RETURNING id", **kwargs) + assert _should_stream_results(query="SELECT id FROM jobs", **kwargs) + + def test_classifier_plain_update_is_non_query(): """Plain DML without RETURNING must still be NON_QUERY (sanity check we don't over-correct).""" analyzer = KeywordQueryAnalyzer()