Merge remote-tracking branch 'origin/master' into HEAD

AGENTS.md

@@ -297,7 +297,7 @@ pre-commit run eslint            # Frontend linting
 ## Platform-Specific Instructions
 
 - **[CLAUDE.md](CLAUDE.md)** - For Claude/Anthropic tools
-- **[.github/copilot-instructions.md](.github/copilot-instructions.md)** - For GitHub Copilot  
+- **[.github/copilot-instructions.md](.github/copilot-instructions.md)** - For GitHub Copilot
 - **[GEMINI.md](GEMINI.md)** - For Google Gemini tools
 - **[GPT.md](GPT.md)** - For OpenAI/ChatGPT tools
 - **[.cursor/rules/dev-standard.mdc](.cursor/rules/dev-standard.mdc)** - For Cursor editor

superset-frontend/CHANGELOG.md

@@ -14,7 +14,7 @@
   "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.
+  under the License
 -->
 
 # Change Log

superset/sql_lab.py

@@ -161,9 +161,6 @@ def get_query(query_id: int) -> Query:
     try:
         return db.session.query(Query).filter_by(id=query_id).one()
     except Exception as ex:
-        # roll back so a poisoned session (e.g. PendingRollbackError after a
-        # failed flush) doesn't fail every subsequent backoff retry identically
-        db.session.rollback()
         raise SqlLabException("Failed at getting query") from ex
 
 

tests/unit_tests/sql_lab_test.py

@@ -35,7 +35,6 @@ from superset.sql.parse import SQLStatement, Table
 from superset.sql_lab import (
     execute_query,
     execute_sql_statements,
-    get_query,
     get_sql_results,
 )
 from superset.utils.rls import apply_rls, get_predicates_for_table
@@ -72,34 +71,6 @@ def test_execute_query(mocker: MockerFixture, app: None) -> None:
     SupersetResultSet.assert_called_with([(42,)], cursor.description, db_engine_spec)
 
 
-def test_get_query_rolls_back_session_before_retrying(
-    mocker: MockerFixture, app: SupersetApp
-) -> None:
-    """
-    A broken transaction (e.g. `PendingRollbackError` following a failed flush)
-    leaves the session unusable until `session.rollback()` is called, so without
-    it every `backoff` retry would reuse the same poisoned session and fail
-    identically. `get_query` must roll back on failure so each retry gets a
-    clean session and has a real chance to succeed.
-    """
-    # avoid actually sleeping through the `backoff` decorator's retry interval
-    mocker.patch("backoff._sync.time.sleep")
-
-    expected_query = mocker.MagicMock()
-    mock_one = mocker.patch("superset.sql_lab.db.session.query")
-    mock_one.return_value.filter_by.return_value.one.side_effect = [
-        Exception("session is broken"),
-        expected_query,
-    ]
-    mock_rollback = mocker.patch("superset.sql_lab.db.session.rollback")
-
-    result = get_query(query_id=1)
-
-    assert result is expected_query
-    assert mock_one.return_value.filter_by.return_value.one.call_count == 2
-    mock_rollback.assert_called_once()
-
-
 @with_config(
     {
         "SQLLAB_PAYLOAD_MAX_MB": 50,