A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
re-enable sql-mode internally (#6558)
Shahmir Varqhaccb4990371c0
diff --git a/frontend/src/core/codemirror/language/languages/sql/sql.ts b/frontend/src/core/codemirror/language/languages/sql/sql.tsindex fc47959dc6..9d47d1b484 100644--- a/frontend/src/core/codemirror/language/languages/sql/sql.ts+++ b/frontend/src/core/codemirror/language/languages/sql/sql.ts@@ -281,10 +281,9 @@ export class SQLLanguageAdapter);}- // TODO: Re-enable after we optimize the endpoint- // if (this.sqlModeEnabled) {- // extensions.push(sqlValidationExtension());- // }+ if (this.sqlModeEnabled) {+ extensions.push(sqlValidationExtension());+ }return extensions;}@@ -641,8 +640,7 @@ function safeDedent(code: string): string {const SQL_VALIDATION_DEBOUNCE_MS = 300;-// @ts-expect-error: TODO: Re-enable after we optimize the endpoint-function _sqlValidationExtension(): Extension {+function sqlValidationExtension(): Extension {let debounceTimeout: number | undefined;let lastValidationRequest: string | null = null;diff --git a/marimo/_config/config.py b/marimo/_config/config.pyindex 4d8064dd3a..07bcbcc310 100644--- a/marimo/_config/config.py+++ b/marimo/_config/config.py@@ -510,7 +510,7 @@ class ExperimentalConfig(TypedDict, total=False):performant_table_charts: boolmcp_docs: boolsql_linter: bool- sql_mode: bool # Not exposed for now+ sql_mode: bool# Internal featurescache: CacheConfigdiff --git a/marimo/_runtime/runtime.py b/marimo/_runtime/runtime.pyindex 687a34bd8b..87b228daa2 100644--- a/marimo/_runtime/runtime.py+++ b/marimo/_runtime/runtime.py@@ -2491,8 +2491,8 @@ class SqlCallbacks:async def _validate_sql_query(self, request: ValidateSQLRequest) -> None:"""Validate an SQL query- This will validate:- - the syntax (parsing)+ This will either validate:+ - the syntax (parsing) or- the catalog (table and column names)"""request_id = request.request_id@@ -2541,17 +2541,10 @@ class SqlCallbacks:).broadcast()return- # Get the parse error for linting- parse_result, parse_error = parse_sql(request.query, engine.dialect)- if parse_error is not None:- # We don't want to fail the validation if there is a parse error- LOGGER.debug("Parse error: %s", parse_error)-if not isinstance(engine, QueryEngine):ValidateSQLResult(request_id=request_id,error=f"Engine {variable_name} does not support catalog validation.",- parse_result=parse_result,).broadcast()return@@ -2561,10 +2554,7 @@ class SqlCallbacks:error_message=error_message,)ValidateSQLResult(- request_id=request_id,- validate_result=validate_result,- parse_result=parse_result,- error=None,+ request_id=request_id, validate_result=validate_result, error=None).broadcast()@kernel_tracer.start_as_current_span("validate_sql")diff --git a/marimo/_sql/engines/types.py b/marimo/_sql/engines/types.pyindex 9902ea70ea..e448f28f29 100644--- a/marimo/_sql/engines/types.py+++ b/marimo/_sql/engines/types.py@@ -13,6 +13,7 @@ from marimo._runtime.context.types import (get_context,runtime_context_installed,)+from marimo._sql.parse import replace_brackets_with_quotesfrom marimo._sql.utils import (is_query_empty,strip_explain_from_error_message,@@ -142,8 +143,9 @@ class QueryEngine(BaseEngine[CONN], ABC):"""Execute a query in explain mode. Returns a tuple of the result and an error if there is one."""explain_query = wrap_query_with_explain(query)+ quoted_query, _ = replace_brackets_with_quotes(explain_query)try:- return self.execute(explain_query), None+ return self.execute(quoted_query), Noneexcept Exception as e:if is_query_empty(query):return None, Nonediff --git a/pyproject.toml b/pyproject.tomlindex e8cdcbd84c..f6e8b84208 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -547,7 +547,7 @@ format_on_save = truemulti_column = trueperformant_table_charts = truesql_linter = true-sql_mode = false+sql_mode = true[tool.marimo.display]dataframes = "rich"diff --git a/tests/_runtime/test_runtime_datasets.py b/tests/_runtime/test_runtime_datasets.pyindex 89e127b477..6845a1482c 100644--- a/tests/_runtime/test_runtime_datasets.py+++ b/tests/_runtime/test_runtime_datasets.py@@ -338,7 +338,7 @@ class TestSQLValidate:]assert validate_sql_results[-1] == ValidateSQLResult(request_id=RequestId("1"),- parse_result=SqlParseResult(success=True, errors=[]),+ parse_result=None,validate_result=SqlCatalogCheckResult(success=True, error_message=None),@@ -365,10 +365,11 @@ class TestSQLValidate:latest_validate_sql_result = validate_sql_results[-1]assert latest_validate_sql_result.request_id == RequestId("2")- assert latest_validate_sql_result.parse_result is not None+ # if not only_parse, parse_result is not None+ assert latest_validate_sql_result.parse_result is None# query is syntactically valid- assert latest_validate_sql_result.parse_result.success is True- assert len(latest_validate_sql_result.parse_result.errors) == 0+ # assert latest_validate_sql_result.parse_result.success is True+ # assert len(latest_validate_sql_result.parse_result.errors) == 0assert latest_validate_sql_result.validate_result is not Noneassert latest_validate_sql_result.validate_result.success is Falsediff --git a/tests/_sql/test_engines.py b/tests/_sql/test_engines.pyindex 808712162b..44a2ebbe60 100644--- a/tests/_sql/test_engines.py+++ b/tests/_sql/test_engines.py@@ -309,6 +309,11 @@ def test_duckdb_execute_in_explain_mode():assert result is Noneassert error is None+ # Test with brackets+ result, error = engine.execute_in_explain_mode("SELECT {1}")+ assert result is not None+ assert error is None+duckdb_conn.close()@@ -381,6 +386,11 @@ def test_sqlalchemy_execute_in_explain_mode():assert result is Noneassert error is None+ # Test with brackets+ result, error = engine.execute_in_explain_mode("SELECT {1}")+ assert result is not None+ assert error is None+def test_sql_type_to_data_type() -> None:"""Test sql_type_to_data_type function."""