execsql2 2.22.1__tar.gz → 2.22.2__tar.gz

{execsql2-2.22.1 → execsql2-2.22.2}/CHANGELOG.md

@@ -13,6 +13,14 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.22.2] - 2026-07-13
+
+### Fixed
+
+- `ASK … SUB` now stores the actual answer ("Yes" or "No"); it previously stored "No" for every response, so `IF(IS_TRUE(…))` and `IF(…)` branches keyed on the answer never took the yes path. Pressing `Esc` at the prompt again quits the script.
+
+______________________________________________________________________
+
 ## [2.22.1] - 2026-07-04
 
 ### Fixed

{execsql2-2.22.1 → execsql2-2.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.22.1
+Version: 2.22.2
 Summary: Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables.
 Project-URL: Homepage, https://execsql2.readthedocs.io
 Project-URL: Repository, https://github.com/geocoug/execsql
@@ -384,7 +384,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.22.1
+    rev: v2.22.2
     hooks:
       - id: execsql-format
 ```

{execsql2-2.22.1 → execsql2-2.22.2}/README.md

@@ -253,7 +253,7 @@ execsql-format --no-sql --in-place scripts/
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.22.1
+    rev: v2.22.2
     hooks:
       - id: execsql-format
 ```

{execsql2-2.22.1 → execsql2-2.22.2}/docs/guides/formatter.md

@@ -160,7 +160,7 @@ select id,name,created_at from users where active = true order by name;
 ```yaml
 repos:
   - repo: https://github.com/geocoug/execsql
-    rev: v2.22.1
+    rev: v2.22.2
     hooks:
       - id: execsql-format
 ```

{execsql2-2.22.1 → execsql2-2.22.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.22.1"
+version = "2.22.2"
 description = "Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE.txt" }
@@ -178,7 +178,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.22.1"
+current_version = "2.22.2"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{execsql2-2.22.1 → execsql2-2.22.2}/src/execsql/utils/gui.py

@@ -540,18 +540,27 @@ def gui_credentials(
 # ---------------------------------------------------------------------------
 
 
-def get_yn(prompt: str) -> bool:
-    """Prompt for a yes/no answer on the terminal."""
+def get_yn(prompt: str) -> str:
+    """Prompt for a yes/no answer on the terminal.
+
+    Returns:
+        ``"y"`` or ``"n"``, or ``chr(27)`` (ESC) if the user aborts via EOF
+        (Ctrl-D / piped stdin closed). Matches the upstream v1.130.1
+        ``get_yn`` character contract expected by callers such as ``x_ask``.
+    """
     while True:
-        answer = input(f"{prompt} [y/n]: ").strip().lower()
+        try:
+            answer = input(f"{prompt} [y/n]: ").strip().lower()
+        except EOFError:
+            return chr(27)
         if answer in ("y", "yes"):
-            return True
+            return "y"
         if answer in ("n", "no"):
-            return False
+            return "n"
         print("Please enter y or n.", file=sys.stderr)
 
 
-def get_yn_win(prompt: str) -> bool:
+def get_yn_win(prompt: str) -> str:
     """GUI yes/no dialog — falls back to terminal in headless mode."""
     return get_yn(prompt)
 

{execsql2-2.22.1 → execsql2-2.22.2}/tests/gui/test_backends.py

@@ -786,27 +786,37 @@ class TestGuiPublicAPI:
         from execsql.utils.gui import get_yn
 
         monkeypatch.setattr("builtins.input", lambda *a: "y")
-        assert get_yn("Continue?") is True
+        assert get_yn("Continue?") == "y"
 
     def test_get_yn_no(self, monkeypatch):
         from execsql.utils.gui import get_yn
 
         monkeypatch.setattr("builtins.input", lambda *a: "n")
-        assert get_yn("Continue?") is False
+        assert get_yn("Continue?") == "n"
 
     def test_get_yn_full_words(self, monkeypatch):
         from execsql.utils.gui import get_yn
 
         inputs = iter(["yes"])
         monkeypatch.setattr("builtins.input", lambda *a: next(inputs))
-        assert get_yn("?") is True
+        assert get_yn("?") == "y"
 
     def test_get_yn_retry_on_bad_input(self, monkeypatch):
         from execsql.utils.gui import get_yn
 
         inputs = iter(["maybe", "no"])
         monkeypatch.setattr("builtins.input", lambda *a: next(inputs))
-        assert get_yn("?") is False
+        assert get_yn("?") == "n"
+
+    def test_get_yn_eof_returns_esc(self, monkeypatch):
+        """Ctrl-D / piped EOF is treated as the quit sentinel, matching upstream."""
+        from execsql.utils.gui import get_yn
+
+        def _raise_eof(*a):
+            raise EOFError
+
+        monkeypatch.setattr("builtins.input", _raise_eof)
+        assert get_yn("?") == chr(27)
 
     def test_gui_credentials_console_fallback(self, monkeypatch):
         """gui_credentials must not call auth.get_password (which needs
@@ -912,7 +922,7 @@ class TestGuiPublicAPI:
         from execsql.utils.gui import get_yn_win
 
         monkeypatch.setattr("builtins.input", lambda *a: "y")
-        assert get_yn_win("?") is True
+        assert get_yn_win("?") == "y"
 
     def test_gui_console_on_off_updates_isrunning(self):
         """gui_console_on/off should be reflected by gui_console_isrunning()."""

{execsql2-2.22.1 → execsql2-2.22.2}/tests/metacommands/test_prompt.py

@@ -499,6 +499,33 @@ class TestXAsk:
             os_mock.name = "posix"
             _prompt.x_ask(**self._kwargs())
 
+    def test_real_get_yn_yes_stores_yes(self, fake_state, monkeypatch) -> None:
+        """Regression: ASK ... SUB var must store "Yes" when the user answers y.
+
+        Exercises the real (unmocked) execsql.utils.gui.get_yn through x_ask,
+        driven by a patched builtins.input, instead of mocking get_yn itself.
+        This is what caught the bool-vs-char-contract regression where
+        get_yn() started returning True/False instead of "y"/"n"/chr(27),
+        making x_ask's `resp == "y"` comparison always false.
+        """
+        s = fake_state()
+        _state.gui_console = None
+        monkeypatch.setattr("builtins.input", lambda *a: "y")
+        with patch("execsql.metacommands.prompt.os") as os_mock:
+            os_mock.name = "posix"
+            _prompt.x_ask(**self._kwargs())
+        s.subvars.add_substitution.assert_called_with("ans", "Yes")
+
+    def test_real_get_yn_no_stores_no(self, fake_state, monkeypatch) -> None:
+        """Regression: ASK ... SUB var must store "No" when the user answers n."""
+        s = fake_state()
+        _state.gui_console = None
+        monkeypatch.setattr("builtins.input", lambda *a: "n")
+        with patch("execsql.metacommands.prompt.os") as os_mock:
+            os_mock.name = "posix"
+            _prompt.x_ask(**self._kwargs())
+        s.subvars.add_substitution.assert_called_with("ans", "No")
+
 
 # ---------------------------------------------------------------------------
 # x_pause

{execsql2-2.22.1 → execsql2-2.22.2}/uv.lock

@@ -722,7 +722,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.22.1"
+version = "2.22.2"
 source = { editable = "." }
 dependencies = [
     { name = "python-dateutil" },