Test CIDR directly

Author: edgarrmondragon

pyproject.toml

@@ -44,11 +44,11 @@ dependencies = [
   "greenlet>=3.0.0a1",
   "sqlalchemy>=1.4",
   "sqlean-py>=0.21.5.1",
-  'typing-extensions; python_version < "3.10"',
 ]
 [project.optional-dependencies]
 dev = [
   "pytest",
+  'typing-extensions; python_version < "3.10"',
 ]
 [project.urls]
 Changelog = "https://github.com/edgarrmondragon/sqlean-driver/blob/main/CHANGELOG.md"
@@ -64,10 +64,10 @@ source = "vcs"
 [tool.hatch.envs.test]
 dependencies = [
   "coverage[toml]>=6.5",
-  "pytest",
   "pytest-github-actions-annotate-failures",
   "sqlalchemy=={matrix:sqlalchemy:2}.*",
 ]
+features = ["dev"]
 matrix-name-format = "{variable}_{value}"
 [tool.hatch.envs.test.env-vars]
 SQLALCHEMY_WARN_20 = "1"
@@ -89,7 +89,8 @@ xml = "coverage xml"
 report = ["coverage combine", "coverage report --show-missing"]
 
 [tool.hatch.envs.typing]
-dependencies = ["mypy>=1.0.0", "pytest"]
+dependencies = ["mypy>=1.0.0"]
+features = ["dev"]
 [tool.hatch.envs.typing.scripts]
 check = "mypy --strict --install-types --non-interactive {args:src/sqlean_driver tests}"
 
@@ -209,6 +210,7 @@ select = [
 target-version = "py38"
 unfixable = [
   "ERA",
+  "F401",
 ]
 
 [tool.ruff.isort]

tests/test_types.py

@@ -2,25 +2,34 @@
 
 from __future__ import annotations
 
-import ipaddress
 import sys
 import typing as t
 import uuid
+from ipaddress import IPv4Interface, IPv4Network, IPv6Interface
 
 import pytest
-from sqlalchemy import Column, Integer, MetaData, Table, create_engine, func, select
+from sqlalchemy import (
+    Column,
+    Integer,
+    MetaData,
+    Table,
+    create_engine,
+    func,
+    select,
+)
 
-from sqlean_driver.custom_types import INET, UUID
+from sqlean_driver.custom_types import CIDR, INET, UUID
 
 if t.TYPE_CHECKING:
     from sqlalchemy import Select
 
 metadata = MetaData()
 table = Table(
-    "table",
+    "test_table",
     metadata,
     Column("id", Integer, primary_key=True),
     Column("ip", INET),
+    Column("cidr", CIDR),
     Column("uuid_col", UUID),
 )
 
@@ -39,34 +48,46 @@
             id="nullable",
         ),
         pytest.param(
-            [{"ip": ipaddress.IPv4Network("192.168.1.1")}],
+            [{"cidr": None}],
+            select(table.c.cidr),
+            (None,),
+            id="nullable_cidr",
+        ),
+        pytest.param(
+            [{"cidr": IPv4Network("192.168.16.3/32")}],
+            select(table.c.cidr),
+            (IPv4Network("192.168.16.3/32"),),
+            id="cidr",
+        ),
+        pytest.param(
+            [{"ip": IPv4Network("192.168.1.1")}],
             select(func.ipfamily(table.c.ip), table.c.ip.ipfamily()),
             (4, 4),
             id="ipfamily",
         ),
         pytest.param(
-            [{"ip": ipaddress.IPv6Interface("2001:db8::123/64")}],
+            [{"ip": IPv6Interface("2001:db8::123/64")}],
             select(func.iphost(table.c.ip), table.c.ip.iphost()),
             ("2001:db8::123", "2001:db8::123"),
             id="iphost",
         ),
         pytest.param(
-            [{"ip": ipaddress.IPv4Interface("192.168.16.12/24")}],
+            [{"ip": IPv4Interface("192.168.16.12/24")}],
             select(func.ipmasklen(table.c.ip), table.c.ip.ipmasklen()),
             (24, 24),
             id="ipmasklen",
         ),
         pytest.param(
-            [{"ip": ipaddress.IPv4Interface("192.168.16.12/24")}],
+            [{"ip": IPv4Interface("192.168.16.12/24")}],
             select(func.ipnetwork(table.c.ip), table.c.ip.ipnetwork()),
             (
-                ipaddress.IPv4Network("192.168.16.0/24"),
-                ipaddress.IPv4Network("192.168.16.0/24"),
+                IPv4Network("192.168.16.0/24"),
+                IPv4Network("192.168.16.0/24"),
             ),
             id="ipnetwork",
         ),
         pytest.param(
-            [{"ip": ipaddress.IPv4Interface("192.168.16.0/24")}],
+            [{"ip": IPv4Interface("192.168.16.0/24")}],
             select(
                 func.ipcontains(table.c.ip, "192.168.16.3"),
                 table.c.ip.ipcontains("192.168.16.3"),
@@ -75,7 +96,7 @@
             id="ipcontains_lhs",
         ),
         pytest.param(
-            [{"ip": ipaddress.IPv4Interface("192.168.16.3")}],
+            [{"ip": IPv4Interface("192.168.16.3")}],
             select(
                 func.ipcontains("192.168.16.0/24", table.c.ip),
             ),