Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion sqlit/domains/connections/providers/adapters/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from __future__ import annotations

import re
from abc import ABC, abstractmethod
from dataclasses import dataclass
from pathlib import Path
Expand All @@ -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:
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions sqlit/domains/query/cli/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
)

Expand Down
18 changes: 17 additions & 1 deletion tests/unit/test_sqlite_returning.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down