Skip to content

Handle IP values with prefix in "inet" type as IPvXInterface#499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1st1 merged 1 commit into from
Nov 19, 2019
Merged

Handle IP values with prefix in "inet" type as IPvXInterface #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asyncpg/pgproto
Open in desktop
Submodule pgproto updated 9 files
+6 −4 buffer.pxd
+51 −5 buffer.pyx
+2 −1 codecs/__init__.pxd
+24 −4 codecs/network.pyx
+1 −1 codecs/text.pyx
+15 −10 codecs/uuid.pyx
+7 −1 cpythonx.pxd
+1 −0 pgproto.pyx
+166 −0 uuid.pyx
4 changes: 2 additions & 2 deletions asyncpg/protocol/codecs/pgproto.pyx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -382,12 +382,12 @@ cdef init_numeric_codecs():
cdef init_network_codecs():
register_core_codec(CIDROID,
<encode_func>pgproto.cidr_encode,
<decode_func>pgproto.net_decode,
<decode_func>pgproto.cidr_decode,
PG_FORMAT_BINARY)

register_core_codec(INETOID,
<encode_func>pgproto.inet_encode,
<decode_func>pgproto.net_decode,
<decode_func>pgproto.inet_decode,
PG_FORMAT_BINARY)

register_core_codec(MACADDROID,
Expand Down
17 changes: 10 additions & 7 deletions docs/usage.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,14 +97,14 @@ The table below shows the correspondence between PostgreSQL and Python types.
| | :class:`ipaddress.IPv6Network\ |
| | <python:ipaddress.IPv6Network>` |
+----------------------+-----------------------------------------------------+
| ``inet`` | :class:`ipaddress.IPv4Network\ |
| | <python:ipaddress.IPv4Network>`, |
| | :class:`ipaddress.IPv6Network\ |
| | <python:ipaddress.IPv6Network>`, |
| ``inet`` | :class:`ipaddress.IPv4Interface\ |
| | <python:ipaddress.IPv4Interface>`, |
| | :class:`ipaddress.IPv6Interface\ |
| | <python:ipaddress.IPv6Interface>`, |
| | :class:`ipaddress.IPv4Address\ |
| | <python:ipaddress.IPv4Address>`, |
| | :class:`ipaddress.IPv6Address\ |
| | <python:ipaddress.IPv6Address>` |
| | <python:ipaddress.IPv6Address>` [#f1]_ |
+----------------------+-----------------------------------------------------+
| ``macaddr`` | :class:`str <python:str>` |
+----------------------+-----------------------------------------------------+
Expand All@@ -127,7 +127,7 @@ The table below shows the correspondence between PostgreSQL and Python types.
| ``interval`` | :class:`datetime.timedelta \ |
| | <python:datetime.timedelta>` |
+----------------------+-----------------------------------------------------+
| ``float``, | :class:`float <python:float>` [#f1]_ |
| ``float``, | :class:`float <python:float>` [#f2]_ |
| ``double precision`` | |
+----------------------+-----------------------------------------------------+
| ``smallint``, | :class:`int <python:int>` |
Expand DownExpand Up@@ -158,7 +158,10 @@ The table below shows the correspondence between PostgreSQL and Python types.

All other types are encoded and decoded as text by default.

.. [#f1] Inexact single-precision ``float`` values may have a different
.. [#f1] Prior to version 0.20.0, asyncpg erroneously treated ``inet`` values
with prefix as ``IPvXNetwork`` instead of ``IPvXInterface``.

.. [#f2] Inexact single-precision ``float`` values may have a different
representation when decoded into a Python float. This is inherent
to the implementation of limited-precision floating point types.
If you need the decimal representation to match, cast the expression
Expand Down
12 changes: 6 additions & 6 deletions tests/test_codecs.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -341,9 +341,12 @@ def _system_timezone():
ipaddress.IPv6Address('ffff' + ':ffff' * 7),
ipaddress.IPv6Address('::1'),
ipaddress.IPv6Address('::'),
ipaddress.IPv4Interface('10.0.0.1/30'),
ipaddress.IPv4Interface('0.0.0.0/0'),
ipaddress.IPv4Interface('255.255.255.255/31'),
dict(
input='127.0.0.0/8',
output=ipaddress.IPv4Network('127.0.0.0/8')),
output=ipaddress.IPv4Interface('127.0.0.0/8')),
dict(
input='127.0.0.1/32',
output=ipaddress.IPv4Address('127.0.0.1')),
Expand All@@ -358,19 +361,16 @@ def _system_timezone():
textoutput='10.11.12.13/32'
),
dict(
input=ipaddress.IPv4Network('10.11.12.13'),
input=ipaddress.IPv4Interface('10.11.12.13'),
textoutput='10.11.12.13/32'
),
dict(
textinput='10.11.12.13',
output=ipaddress.IPv4Address('10.11.12.13'),
),
dict(
# Non-zero address bits after the network prefix are permitted
# by postgres, but are invalid in Python
# (and zeroed out by supernet()).
textinput='10.11.12.13/0',
output=ipaddress.IPv4Network('0.0.0.0/0'),
output=ipaddress.IPv4Interface('10.11.12.13/0'),
),
]),
('macaddr', 'macaddr', [
Expand Down