execsql2 2.22.8__tar.gz → 2.22.9__tar.gz

{execsql2-2.22.8 → execsql2-2.22.9}/CHANGELOG.md

@@ -13,6 +13,15 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.22.9] - 2026-09-24
+
+### Fixed
+
+- `EMAIL`, and the `ON ERROR_HALT EMAIL` and `ON CANCEL_HALT EMAIL` hooks, failed with `AttributeError: 'SMTP' object has no attribute 'ehlo_or_hello_if_needed'` instead of sending. Every send was affected, on every server and TLS setting.
+- An `[email]` `username` with no `password` or `enc_password` now reports a configuration error instead of failing with a `TypeError` from `smtplib`.
+
+______________________________________________________________________
+
 ## [2.22.8] - 2026-09-17
 
 ### Fixed

{execsql2-2.22.8 → execsql2-2.22.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execsql2
-Version: 2.22.8
+Version: 2.22.9
 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.8
+    rev: v2.22.9
     hooks:
       - id: execsql-format
 ```

{execsql2-2.22.8 → execsql2-2.22.9}/README.md

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

{execsql2-2.22.8 → execsql2-2.22.9}/docs/about/divergence.md

@@ -325,6 +325,7 @@ These are behavioral changes driven by security or correctness issues in the ups
 | Formatter dropped clauses from unparsable SQL                      | The sqlglot parse ran at `ErrorLevel.IGNORE`, which answers a statement it cannot parse with a partial AST rather than an error — the tokens it failed on are absent, and regenerating from that AST wrote back SQL the author never had. `INSERT ... CROSS JOIN LATERAL (VALUES ...) AS g(a, b) ON CONFLICT (a) DO NOTHING` came back without its `DO NOTHING`, a syntax error that `--in-place` reported as `reformatted`. Every guard passed it: one statement for one semicolon, 88% of the input's alphanumeric characters, and no string literals to round-trip. The guards are quantitative and the loss is qualitative — a dropped `DISTINCT`, `CASCADE`, `DESC`, or `NOT` is smaller still — so the parse now runs at `ErrorLevel.RAISE` and SQL that does not fully parse is emitted exactly as written. |
 | Formatter moved a comment into the middle of an expression         | Comments are hidden from sqlglot as `/* marker */ line`, and sqlglot attaches the marker to an AST node. When it then reflows that node across several lines the marker surfaces deep inside the expression — `COALESCE((a.meas_value).undetected, FALSE)` carried it onto the `).undetected, FALSE)` continuation line — so restoring the comment above the marker split the expression around it, and the resulting layout reformatted differently on the next run. Comments whose markers sqlglot dropped entirely (inside a `CASE`) were re-inserted by token matching, which picked continuation lines the same way. Both paths now place the comment above the line where its expression opens, found by walking back to the parenthesis depth the comment sat at in the input.                              |
 | Formatter left a space before punctuation where a comment had been | Marker runs are replaced by the one space that keeps their neighbours apart, so `AND /* m */ RTRIM(` does not become `ANDRTRIM(`. Where sqlglot placed the run against a `;`, `,`, `)`, or `.` that space was residue rather than a separator: `1 = 1 /* m */;` came back as `1 = 1 ;`, normalised only on the next run, so `--check` failed on output the formatter had just produced. The run is now removed without a space at the ends of a line and against punctuation that binds to the token before it.                                                                                                                                                                                                                                                                                                    |
+| `EMAIL` SMTP login without a password                              | Upstream calls `smtplib.login()` with only a username when `[email] password` and `enc_password` are both unset, which raises `TypeError` from the stdlib — `login()` has no single-argument form. execsql2 reports a configuration error naming the missing password instead.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 
 ______________________________________________________________________
 

{execsql2-2.22.8 → execsql2-2.22.9}/docs/guides/formatter.md

@@ -188,7 +188,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.8
+    rev: v2.22.9
     hooks:
       - id: execsql-format
 ```

{execsql2-2.22.8 → execsql2-2.22.9}/docs/reference/configuration.md

@@ -266,7 +266,7 @@ The section and property names that may be used in a configuration file are list
 
 `username`
 
-:   The name of the user if the SMTP server requires login authentication.
+:   The name of the user if the SMTP server requires login authentication. If `username` is set, either `password` or `enc_password` must also be set; execsql reports an error rather than attempting an incomplete login.
 
 `password`
 

{execsql2-2.22.8 → execsql2-2.22.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.22.8"
+version = "2.22.9"
 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.8"
+current_version = "2.22.9"
 commit = true
 tag = true
 tag_name = "v{new_version}"
@@ -256,6 +256,10 @@ fo = "fo"
 odf = "odf"
 # Latin-1 test data: b"caf\xe9" decodes to "café"
 caf = "caf"
+# SMTP verb: EHLO-or-HELO, not the English word. Correcting it to "hello"
+# renames smtplib.ehlo_or_helo_if_needed() into a method that does not exist,
+# which is exactly how every EMAIL send broke in 2.22.9.
+helo = "helo"
 
 [tool.tox]
 required = ["tox-uv"]

{execsql2-2.22.8 → execsql2-2.22.9}/src/execsql/data/execsql.conf.template

@@ -242,6 +242,7 @@
 # Settings for the EMAIL metacommand.
 
 # SMTP server connection.
+# If username is set, password (or enc_password, below) is required too.
 #host=
 #port=
 #username=

{execsql2-2.22.8 → execsql2-2.22.9}/src/execsql/utils/mail.py

@@ -66,15 +66,19 @@ class Mailer:
                 self.smtpconn = smtplib.SMTP_SSL(conf.smtp_host, conf.smtp_port, timeout=smtp_timeout)
             else:
                 self.smtpconn = smtplib.SMTP(conf.smtp_host, conf.smtp_port, timeout=smtp_timeout)
-        self.smtpconn.ehlo_or_hello_if_needed()
+        self.smtpconn.ehlo_or_helo_if_needed()
         if conf.smtp_tls:
             self.smtpconn.starttls()
             self.smtpconn.ehlo(conf.smtp_host)
         if conf.smtp_username:
-            if conf.smtp_password:
-                self.smtpconn.login(conf.smtp_username, conf.smtp_password)
-            else:
-                self.smtpconn.login(conf.smtp_username)
+            if not conf.smtp_password:
+                # smtplib.login() requires a password; calling it with only a
+                # username raises TypeError deep in the stdlib.
+                raise ErrInfo(
+                    type="error",
+                    other_msg="Can't send email; an SMTP username is configured but no password.",
+                )
+            self.smtpconn.login(conf.smtp_username, conf.smtp_password)
 
     def sendmail(
         self,

{execsql2-2.22.8 → execsql2-2.22.9}/tests/test_mail.py

@@ -1,13 +1,21 @@
 """
 Tests for execsql.utils.mail — MailSpec construction and Mailer config validation.
 
-Mailer.__init__ establishes an SMTP connection, so all Mailer tests mock smtplib.
-MailSpec is a pure data class that can be tested without mocking.
+Mailer.__init__ establishes an SMTP connection.  Configuration tests mock
+smtplib (always with a spec, so an assertion cannot name a method smtplib
+does not have); the round-trip tests drive Mailer against a real in-process
+SMTP server on loopback.  MailSpec is a pure data class needing no mocking.
 """
 
 from __future__ import annotations
 
-from unittest.mock import MagicMock, patch
+import base64
+import smtplib
+import socket
+import socketserver
+import threading
+from typing import cast
+from unittest.mock import create_autospec, patch
 
 import pytest
 
@@ -15,6 +23,12 @@ import execsql.state as _state
 from execsql.exceptions import ErrInfo
 from execsql.utils.mail import Mailer, MailSpec
 
+# Captured before any @patch("smtplib.SMTP") swaps the real class for a mock —
+# create_autospec() cannot spec a Mock, and a spec'd connection is the whole
+# point: it rejects an assertion naming a method smtplib does not have.
+_REAL_SMTP = smtplib.SMTP
+_REAL_SMTP_SSL = smtplib.SMTP_SSL
+
 
 # ---------------------------------------------------------------------------
 # MailSpec — construction and attributes
@@ -80,7 +94,7 @@ class TestMailerConfigValidation:
 
     @patch("smtplib.SMTP")
     def test_creates_smtp_connection(self, mock_smtp_cls, minimal_conf):
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = None
@@ -90,13 +104,13 @@ class TestMailerConfigValidation:
         _state.conf.smtp_password = None
         m = Mailer()
         mock_smtp_cls.assert_called_once_with("mail.example.com", timeout=30)
-        mock_conn.ehlo_or_hello_if_needed.assert_called_once()
+        mock_conn.ehlo_or_helo_if_needed.assert_called_once()
         # Clean up to avoid __del__ issues
         del m.smtpconn
 
     @patch("smtplib.SMTP")
     def test_creates_smtp_connection_with_port(self, mock_smtp_cls, minimal_conf):
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = 587
@@ -110,7 +124,7 @@ class TestMailerConfigValidation:
 
     @patch("smtplib.SMTP_SSL")
     def test_creates_smtp_ssl_connection(self, mock_smtp_ssl_cls, minimal_conf):
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP_SSL, instance=True)
         mock_smtp_ssl_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = None
@@ -124,7 +138,7 @@ class TestMailerConfigValidation:
 
     @patch("smtplib.SMTP")
     def test_starttls_called_when_tls_enabled(self, mock_smtp_cls, minimal_conf):
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = None
@@ -138,7 +152,7 @@ class TestMailerConfigValidation:
 
     @patch("smtplib.SMTP")
     def test_login_called_with_credentials(self, mock_smtp_cls, minimal_conf):
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = None
@@ -151,8 +165,9 @@ class TestMailerConfigValidation:
         del m.smtpconn
 
     @patch("smtplib.SMTP")
-    def test_login_without_password(self, mock_smtp_cls, minimal_conf):
-        mock_conn = MagicMock()
+    def test_username_without_password_raises(self, mock_smtp_cls, minimal_conf):
+        """smtplib.login() has no single-argument form, so this must be reported, not attempted."""
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = None
@@ -160,9 +175,9 @@ class TestMailerConfigValidation:
         _state.conf.smtp_tls = False
         _state.conf.smtp_username = "user"
         _state.conf.smtp_password = None
-        m = Mailer()
-        mock_conn.login.assert_called_once_with("user")
-        del m.smtpconn
+        with pytest.raises(ErrInfo, match="username is configured but no password"):
+            Mailer()
+        mock_conn.login.assert_not_called()
 
 
 # ---------------------------------------------------------------------------
@@ -173,7 +188,7 @@ class TestMailerConfigValidation:
 class TestMailerSendmail:
     @patch("smtplib.SMTP")
     def _make_mailer(self, mock_smtp_cls):
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _state.conf.smtp_host = "mail.example.com"
         _state.conf.smtp_port = None
@@ -257,7 +272,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_context_manager_returns_mailer_instance(self, mock_smtp_cls, minimal_conf):
         """__enter__ should return the Mailer itself."""
-        mock_smtp_cls.return_value = MagicMock()
+        mock_smtp_cls.return_value = create_autospec(_REAL_SMTP, instance=True)
         _smtp_conf(minimal_conf)
         with Mailer() as m:
             assert isinstance(m, Mailer)
@@ -265,7 +280,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_context_manager_exit_calls_close(self, mock_smtp_cls, minimal_conf):
         """__exit__ must call close(), which removes smtpconn."""
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _smtp_conf(minimal_conf)
         m = Mailer()
@@ -277,7 +292,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_context_manager_exit_called_on_with_block_exit(self, mock_smtp_cls, minimal_conf):
         """Leaving a `with` block must trigger __exit__ and remove smtpconn."""
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _smtp_conf(minimal_conf)
         with Mailer() as m:
@@ -288,7 +303,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_close_is_idempotent(self, mock_smtp_cls, minimal_conf):
         """Calling close() twice must not raise."""
-        mock_smtp_cls.return_value = MagicMock()
+        mock_smtp_cls.return_value = create_autospec(_REAL_SMTP, instance=True)
         _smtp_conf(minimal_conf)
         m = Mailer()
         m.close()
@@ -297,7 +312,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_close_calls_quit_on_smtpconn(self, mock_smtp_cls, minimal_conf):
         """close() should call smtpconn.quit() when a connection is open."""
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_smtp_cls.return_value = mock_conn
         _smtp_conf(minimal_conf)
         m = Mailer()
@@ -307,7 +322,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_close_survives_quit_raising(self, mock_smtp_cls, minimal_conf):
         """close() must not propagate exceptions from smtpconn.quit()."""
-        mock_conn = MagicMock()
+        mock_conn = create_autospec(_REAL_SMTP, instance=True)
         mock_conn.quit.side_effect = OSError("connection already closed")
         mock_smtp_cls.return_value = mock_conn
         _smtp_conf(minimal_conf)
@@ -323,7 +338,7 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_del_does_not_raise_on_normal_instance(self, mock_smtp_cls, minimal_conf):
         """__del__ on a fully initialised (and already closed) Mailer must not raise."""
-        mock_smtp_cls.return_value = MagicMock()
+        mock_smtp_cls.return_value = create_autospec(_REAL_SMTP, instance=True)
         _smtp_conf(minimal_conf)
         m = Mailer()
         m.close()
@@ -332,7 +347,159 @@ class TestMailerContextManager:
     @patch("smtplib.SMTP")
     def test_context_manager_exit_suppresses_no_exceptions(self, mock_smtp_cls, minimal_conf):
         """__exit__ returns None, so exceptions inside the block propagate normally."""
-        mock_smtp_cls.return_value = MagicMock()
+        mock_smtp_cls.return_value = create_autospec(_REAL_SMTP, instance=True)
         _smtp_conf(minimal_conf)
         with pytest.raises(ValueError, match="deliberate"), Mailer():
             raise ValueError("deliberate")
+
+
+# ---------------------------------------------------------------------------
+# Mailer — against a real in-process SMTP server
+#
+# No mock can catch a call to a method smtplib does not have, or a reply the
+# protocol does not allow.  These tests drive Mailer over a loopback socket
+# against a minimal SMTP responder, so the whole connect/EHLO/MAIL/RCPT/DATA
+# path is exercised as the stdlib actually implements it.
+# ---------------------------------------------------------------------------
+
+
+class _CapturingSMTPHandler(socketserver.StreamRequestHandler):
+    """Minimal SMTP responder: enough of RFC 5321 for smtplib to send a message."""
+
+    def handle(self) -> None:
+        self._reply("220 localhost execsql test server")
+        envelope: dict[str, object] = {"rcpt": []}
+        while True:
+            line = self.rfile.readline()
+            if not line:
+                return
+            command = line.decode("ascii", "replace").rstrip("\r\n")
+            verb = command.split(None, 1)[0].upper() if command else ""
+            if verb == "EHLO":
+                self._reply("250-localhost\r\n250-8BITMIME\r\n250 HELP")
+            elif verb == "HELO":
+                self._reply("250 localhost")
+            elif verb == "MAIL":
+                envelope["mail_from"] = command
+                self._reply("250 OK")
+            elif verb == "RCPT":
+                cast(list, envelope["rcpt"]).append(command)
+                self._reply("250 OK")
+            elif verb == "DATA":
+                self._reply("354 End data with <CR><LF>.<CR><LF>")
+                envelope["data"] = self._read_data()
+                self.server.received.append(envelope)  # type: ignore[attr-defined]
+                self._reply("250 OK")
+            elif verb == "QUIT":
+                self._reply("221 Bye")
+                return
+            elif verb == "RSET":
+                self._reply("250 OK")
+            else:
+                self._reply("502 Command not implemented")
+
+    def _reply(self, text: str) -> None:
+        self.wfile.write(text.encode("ascii") + b"\r\n")
+        self.wfile.flush()
+
+    def _read_data(self) -> str:
+        lines: list[str] = []
+        while True:
+            line = self.rfile.readline()
+            if not line or line in (b".\r\n", b".\n"):
+                break
+            decoded = line.decode("utf-8", "replace").rstrip("\r\n")
+            # Undo dot-stuffing.
+            lines.append(decoded[1:] if decoded.startswith("..") else decoded)
+        return "\n".join(lines)
+
+
+class _SMTPTestServer(socketserver.ThreadingTCPServer):
+    allow_reuse_address = True
+    daemon_threads = True
+
+    def __init__(self) -> None:
+        super().__init__(("127.0.0.1", 0), _CapturingSMTPHandler)
+        self.received: list[dict[str, object]] = []
+
+
+@pytest.fixture
+def smtp_server(minimal_conf):
+    """A loopback SMTP server, with _state.conf pointed at it."""
+    server = _SMTPTestServer()
+    thread = threading.Thread(target=server.serve_forever, daemon=True)
+    thread.start()
+    _state.conf.smtp_host, _state.conf.smtp_port = server.server_address[:2]
+    _state.conf.smtp_ssl = False
+    _state.conf.smtp_tls = False
+    _state.conf.smtp_username = None
+    _state.conf.smtp_password = None
+    _state.conf.email_format = "text"
+    _state.conf.email_css = None
+    try:
+        yield server
+    finally:
+        server.shutdown()
+        server.server_close()
+        thread.join(timeout=5)
+
+
+class TestMailerAgainstRealServer:
+    def test_plain_text_message_round_trip(self, smtp_server):
+        with Mailer() as m:
+            m.sendmail("from@a.com", "to@b.com", "Round trip", "Body text")
+        assert len(smtp_server.received) == 1
+        envelope = smtp_server.received[0]
+        assert "from@a.com" in cast(str, envelope["mail_from"])
+        assert any("to@b.com" in r for r in cast(list, envelope["rcpt"]))
+        data = cast(str, envelope["data"])
+        assert "Subject: Round trip" in data
+        assert "Body text" in data
+
+    def test_multiple_recipients_each_get_an_rcpt(self, smtp_server):
+        with Mailer() as m:
+            m.sendmail("from@a.com", "b@x.com;c@x.com,d@x.com", "Sub", "Body")
+        rcpt = cast(list, smtp_server.received[0]["rcpt"])
+        assert len(rcpt) == 3
+
+    def test_content_file_and_attachment(self, smtp_server, tmp_path):
+        content_file = tmp_path / "body.txt"
+        content_file.write_text("Appended body line")
+        attach_file = tmp_path / "data.csv"
+        attach_file.write_bytes(b"col1,col2\n1,2\n")
+        with Mailer() as m:
+            m.sendmail(
+                "from@a.com",
+                "to@b.com",
+                "With files",
+                "Body",
+                content_filename=str(content_file),
+                attach_filename=str(attach_file),
+            )
+        data = cast(str, smtp_server.received[0]["data"])
+        assert "Appended body line" in data
+        assert 'filename="data.csv"' in data
+        # The attachment is base64-encoded, so the raw bytes must not appear.
+        assert base64.b64encode(b"col1,col2\n1,2\n").decode() in data.replace("\n", "")
+
+    def test_html_format_message(self, smtp_server):
+        _state.conf.email_format = "html"
+        _state.conf.email_css = "body { color: red; }"
+        with Mailer() as m:
+            m.sendmail("from@a.com", "to@b.com", "HTML", "<p>Hello</p>")
+        data = cast(str, smtp_server.received[0]["data"])
+        assert "Content-Type: text/html" in data
+
+    def test_unreachable_host_raises_oserror(self, minimal_conf):
+        """A closed port must surface as a connection error, not hang."""
+        with socket.socket() as probe:
+            probe.bind(("127.0.0.1", 0))
+            dead_port = probe.getsockname()[1]
+        _state.conf.smtp_host = "127.0.0.1"
+        _state.conf.smtp_port = dead_port
+        _state.conf.smtp_ssl = False
+        _state.conf.smtp_tls = False
+        _state.conf.smtp_username = None
+        _state.conf.smtp_password = None
+        with pytest.raises(OSError):
+            Mailer()

{execsql2-2.22.8 → execsql2-2.22.9}/uv.lock

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