]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge "Add MACCADDR8 for PGCompiler" into main
authormike bayer <mike_mp@zzzcomputing.com>
Tue, 20 Dec 2022 15:47:30 +0000 (15:47 +0000)
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>
Tue, 20 Dec 2022 15:47:30 +0000 (15:47 +0000)
1  2 
doc/build/dialects/postgresql.rst
lib/sqlalchemy/dialects/postgresql/__init__.py
lib/sqlalchemy/dialects/postgresql/base.py
lib/sqlalchemy/dialects/postgresql/types.py
test/dialect/postgresql/test_types.py

Simple merge
index 3fb29812b949e01023f5ada2ace49204ed1521eb,5893a1a9148901c409ebbe5d5c9365e377b4246d..80455b94988009a31cf8053f13bce5f4994611ec
@@@ -1443,9 -1427,9 +1444,10 @@@ from .types import PGCidr as PGCidr  # 
  from .types import PGInet as PGInet  # noqa: F401
  from .types import PGInterval as PGInterval  # noqa: F401
  from .types import PGMacAddr as PGMacAddr  # noqa: F401
+ from .types import PGMacAddr8 as PGMacAddr8  # noqa: F401
  from .types import PGUuid as PGUuid
  from .types import REGCLASS as REGCLASS
 +from .types import REGCONFIG as REGCONFIG  # noqa: F401
  from .types import TIME as TIME
  from .types import TIMESTAMP as TIMESTAMP
  from .types import TSVECTOR as TSVECTOR
Simple merge