Commit e240be5
Merge origin/main into feat/async-parity
Brings in main's "Add basic support for SQLAlchemy ORM (aws#1224)" (a2aa602).
Conflict resolutions:
- aws_advanced_python_wrapper/__init__.py: kept feat's _dbapi.install()
structure (dynamically installs the full PEP 249 surface; verified
_dbapi._PEP249_NAMES covers all 9 exceptions main exported explicitly,
plus type ctors/singletons + apilevel/threadsafety/paramstyle).
Preserved main's only unique addition, __version__ = DriverInfo.DRIVER_VERSION
(+ DriverInfo import). Dropped main's redundant explicit pep249 imports
and list-style __all__.
- pyproject.toml: dropped main's [tool.poetry.plugins."sqlalchemy.dialects"]
block. feat is fully PEP 621 ([project.entry-points]); mixing the legacy
poetry-plugins mechanism would risk dual-registration of the same
entry-point group. The ORM dialects are re-registered under feat's
PEP 621 block in a follow-up commit (adopting main's approved
dialect+driver URL convention).
Dropped main's aws_advanced_python_wrapper/sqlalchemy/mysql_orm_dialect.py:
feat's sqlalchemy_dialects/mysql.py is the more robust implementation
(failover-signal handling via _FailoverSuccessRewrapMixin + is_disconnect,
async sibling, surgical introspection overrides). main's ORM dialect also
shipped two defects: a dangling pg_orm_dialect entry point (module never
committed) and a _detect_charset that requires CMySQLConnection and raises
under the recommended Aurora-MySQL use_pure=True config.
Kept main's ORM integration tests (tests/integration/container/sqlalchemy/)
for salvage: they already target the mysql+aws_wrapper_mysqlconnector:// URL
that the follow-up convention change adopts, so they will bind to feat's
dialect. They are infra-gated (Aurora) and not part of unit CI.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>4 files changed
Lines changed: 1431 additions & 0 deletions
File tree
- aws_advanced_python_wrapper
- tests/integration/container/sqlalchemy
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| 29 | + | |
| 30 | + | |
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
0 commit comments