pyOpenVBA 5.1.2__tar.gz → 5.1.3__tar.gz

{pyopenvba-5.1.2 → pyopenvba-5.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pyOpenVBA
-Version: 5.1.2
+Version: 5.1.3
 Summary: Read and write VBA macros and Excel Power Query in pure Python, no dependencies.
 Project-URL: Homepage, https://github.com/WilliamSmithEdward/pyOpenVBA
 Project-URL: Repository, https://github.com/WilliamSmithEdward/pyOpenVBA

{pyopenvba-5.1.2 → pyopenvba-5.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyOpenVBA"
-version = "5.1.2"
+version = "5.1.3"
 description = "Read and write VBA macros and Excel Power Query in pure Python, no dependencies."
 readme = "README.md"
 license = { text = "MIT" }

{pyopenvba-5.1.2 → pyopenvba-5.1.3}/src/pyopenvba/__init__.py

@@ -291,4 +291,4 @@ def push_power_query(
     """
     return _push_queries(src_dir, workbook, out=out, encoding=encoding, remove_missing=remove_missing)
 
-__version__ = "5.1.2"
+__version__ = "5.1.3"

{pyopenvba-5.1.2 → pyopenvba-5.1.3}/src/pyopenvba/access/_index.py

@@ -58,7 +58,7 @@ from pyopenvba.access._pages import (
     PAGE_SIZE,
     PageStore,
 )
-from pyopenvba.access._rows import decode_datetime
+from pyopenvba.access._rows import decode_datetime, scaled_decimal, scaled_int
 from pyopenvba.access._tdef import (
     TYPE_BIGINT,
     TYPE_BINARY,
@@ -463,7 +463,10 @@ def _encode_value(column: ColumnDef, value: object) -> bytes:
     if code == TYPE_NUMERIC:
         if not isinstance(value, (int, Decimal)):
             raise AccessError(f"column {column.name!r}: {value!r} is not a Decimal")
-        scaled = int(Decimal(value).scaleb(column.scale))
+        # Through ``scaled_int``, so the key rounds a fractional value the
+        # way the row encoder does and carries a 29-digit one without the
+        # default context rounding it (GitHub issue #20).
+        scaled = scaled_int(Decimal(value), column.scale)
         magnitude = abs(scaled).to_bytes(16, "big")
         return b"\xff" + magnitude if scaled >= 0 else b"\x00" + _invert(magnitude)
     if code == TYPE_GUID:
@@ -510,5 +513,5 @@ def _decode_fixed(column: ColumnDef, raw: bytes) -> object:
             value = -Decimal(int.from_bytes(_invert(magnitude), "big"))
         else:
             raise AccessError(f"column {column.name!r}: Decimal key sign byte {sign:#04x}")
-        return value.scaleb(-column.scale)
+        return scaled_decimal(value, -column.scale)
     raise AccessError(f"column {column.name!r}: no fixed key codec for {column.type_name}")

{pyopenvba-5.1.2 → pyopenvba-5.1.3}/src/pyopenvba/access/_rows.py

@@ -23,7 +23,7 @@ import datetime as _dt
 import struct
 import uuid
 from dataclasses import dataclass
-from decimal import ROUND_HALF_EVEN, Decimal
+from decimal import ROUND_HALF_EVEN, Decimal, localcontext
 
 from pyopenvba.access_read import AccessError
 from pyopenvba.access._tdef import (
@@ -203,6 +203,33 @@ def encode_datetime(value: _dt.datetime) -> bytes:
     return struct.pack("<d", number)
 
 
+#: A Decimal column is a 16-byte magnitude, so a value carries up to 39
+#: digits, while Python's default arithmetic context rounds at 28.  Every
+#: Decimal conversion here and in the index key codec runs at this
+#: precision instead: scaling ``2**96 - 1`` through the default context
+#: returns it five too high, which puts a key out of step with the row it
+#: points at (GitHub issue #20).
+DECIMAL_PREC = 64
+
+
+def scaled_decimal(value: Decimal | int, scale: int) -> Decimal:
+    """``value`` shifted by ``10 ** scale``, with no context rounding."""
+    with localcontext() as ctx:
+        ctx.prec = DECIMAL_PREC
+        return Decimal(value).scaleb(scale)
+
+
+def scaled_int(value: Decimal, scale: int) -> int:
+    """``value`` shifted by ``10 ** scale`` and rounded to an integer.
+
+    Half-even, as Access rounds, and at a precision no Decimal a column
+    can hold will overflow.
+    """
+    with localcontext() as ctx:
+        ctx.prec = DECIMAL_PREC
+        return int(Decimal(value).scaleb(scale).to_integral_value())
+
+
 def decode_numeric(raw: bytes, scale: int) -> Decimal:
     if len(raw) != 17:
         raise AccessError(f"Decimal value is {len(raw)} bytes, not 17")
@@ -211,12 +238,12 @@ def decode_numeric(raw: bytes, scale: int) -> Decimal:
     magnitude = 0
     for word in words:
         magnitude = (magnitude << 32) | word
-    value = Decimal(magnitude).scaleb(-scale)
+    value = scaled_decimal(magnitude, -scale)
     return -value if negative else value
 
 
 def encode_numeric(value: Decimal, scale: int) -> bytes:
-    scaled = int((value.copy_abs() * (Decimal(10) ** scale)).to_integral_value())
+    scaled = scaled_int(value.copy_abs(), scale)
     if scaled >= 1 << 128:
         raise AccessError("Decimal value does not fit 16 bytes")
     words = [(scaled >> shift) & 0xFFFFFFFF for shift in (96, 64, 32, 0)]

{pyopenvba-5.1.2 → pyopenvba-5.1.3}/src/pyopenvba/access/database.py

@@ -4156,24 +4156,41 @@ class AccessDatabase:
     def delete_module(self, name: str) -> None:
         """Remove a module and every structure it occupies."""
         module = self.module(name)
-        index = [m.name for m in self.modules()].index(module.name)
         encoding = encoding_of(self._vba_dir()[1])
         storage = self.table(STORAGE_TABLE)
         modules_id, project_id, streams_id = self._vba_storage_ids()
 
-        # A module's storage folder is linked to it by position, not by
-        # name: deleting the second of three modules, Access dropped the
-        # second folder and left the others named as they were.
-        folders = sorted(
+        # The container's own DirData names each module's storage folder,
+        # the way `_delete_design` reads it.  This used to take the folder
+        # by position among `modules()`, which is dir-stream order and
+        # includes the module behind a form or report.  Those have no
+        # folder here at all, so the two lists were different lengths and
+        # every module after a document one sat a place high: deleting one
+        # took another's folder, or ran off the end (GitHub issue #19).
+        listing = next(
             (
-                (rid, row)
-                for rid, row in storage.rows_with_ids()
-                if _as_int(row["ParentId"]) == modules_id and _as_int(row["Type"]) == 1
+                payload
+                for _rid, row in storage.rows_with_ids()
+                if _as_int(row["ParentId"]) == modules_id
+                and str(row["Name"]) == DIR_DATA
+                and isinstance(payload := row.get("Lv"), bytes)
             ),
-            key=lambda pair: _as_int(pair[1]["Id"]),
+            None,
+        )
+        entries = dict(dir_data_entries(listing)) if listing is not None else {}
+        if module.name not in entries:
+            raise AccessError(
+                f"{module.name!r} is the code behind a form or report, which has no "
+                "storage folder of its own; delete the design instead"
+            )
+        folder_name = entries[module.name]
+        folder_rid, folder_id = next(
+            (rid, _as_int(row["Id"]))
+            for rid, row in storage.rows_with_ids()
+            if _as_int(row["ParentId"]) == modules_id
+            and _as_int(row["Type"]) == TYPE_FOLDER
+            and str(row["Name"]) == folder_name
         )
-        folder_rid, folder_row = folders[index]
-        folder_name, folder_id = str(folder_row["Name"]), _as_int(folder_row["Id"])
         doomed = [folder_rid] + [
             rid for rid, row in storage.rows_with_ids() if _as_int(row["ParentId"]) == folder_id
         ]