From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 6 Jan 2023 13:53:14 +0000 (+0000)
Subject: refactor(crdb): only expose register_crdb_adapters()
X-Git-Tag: pool-3.2.0~135^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d00a91ef74d2e2968ebd7b03a2728cfb749f0f;p=thirdparty%2Fpsycopg.git

refactor(crdb): only expose register_crdb_adapters()

Other functions are just an internal arrangement.
---

diff --git a/psycopg/psycopg/crdb/_types.py b/psycopg/psycopg/crdb/_types.py
index 5311e05b0..e685c9504 100644
--- a/psycopg/psycopg/crdb/_types.py
+++ b/psycopg/psycopg/crdb/_types.py
@@ -31,7 +31,25 @@ class CrdbNoneDumper(NoneDumper):
     oid = TEXT_OID
 
 
-def register_postgres_adapters(context: AdaptContext) -> None:
+def register_crdb_adapters(context: AdaptContext) -> None:
+    from .. import dbapi20
+    from ..types import array
+
+    _register_postgres_adapters(context)
+
+    # String must come after enum to map text oid -> string dumper
+    _register_crdb_enum_adapters(context)
+    _register_crdb_string_adapters(context)
+    _register_crdb_json_adapters(context)
+    _register_crdb_net_adapters(context)
+    _register_crdb_none_adapters(context)
+
+    dbapi20.register_dbapi20_adapters(adapters)
+
+    array.register_all_arrays(adapters)
+
+
+def _register_postgres_adapters(context: AdaptContext) -> None:
     # Same adapters used by PostgreSQL, or a good starting point for customization
 
     from ..types import array, bool, composite, datetime
@@ -46,25 +64,7 @@ def register_postgres_adapters(context: AdaptContext) -> None:
     uuid.register_default_adapters(context)
 
 
-def register_crdb_adapters(context: AdaptContext) -> None:
-    from .. import dbapi20
-    from ..types import array
-
-    register_postgres_adapters(context)
-
-    # String must come after enum to map text oid -> string dumper
-    register_crdb_enum_adapters(context)
-    register_crdb_string_adapters(context)
-    register_crdb_json_adapters(context)
-    register_crdb_net_adapters(context)
-    register_crdb_none_adapters(context)
-
-    dbapi20.register_dbapi20_adapters(adapters)
-
-    array.register_all_arrays(adapters)
-
-
-def register_crdb_string_adapters(context: AdaptContext) -> None:
+def _register_crdb_string_adapters(context: AdaptContext) -> None:
     from ..types import string
 
     # Dump strings with text oid instead of unknown.
@@ -73,12 +73,12 @@ def register_crdb_string_adapters(context: AdaptContext) -> None:
     context.adapters.register_dumper(str, string.StrBinaryDumper)
 
 
-def register_crdb_enum_adapters(context: AdaptContext) -> None:
+def _register_crdb_enum_adapters(context: AdaptContext) -> None:
     context.adapters.register_dumper(Enum, CrdbEnumBinaryDumper)
     context.adapters.register_dumper(Enum, CrdbEnumDumper)
 
 
-def register_crdb_json_adapters(context: AdaptContext) -> None:
+def _register_crdb_json_adapters(context: AdaptContext) -> None:
     from ..types import json
 
     adapters = context.adapters
@@ -96,7 +96,7 @@ def register_crdb_json_adapters(context: AdaptContext) -> None:
     adapters.register_loader("jsonb", json.JsonbBinaryLoader)
 
 
-def register_crdb_net_adapters(context: AdaptContext) -> None:
+def _register_crdb_net_adapters(context: AdaptContext) -> None:
     from ..types import net
 
     adapters = context.adapters
@@ -114,7 +114,7 @@ def register_crdb_net_adapters(context: AdaptContext) -> None:
     adapters.register_loader("inet", net.InetBinaryLoader)
 
 
-def register_crdb_none_adapters(context: AdaptContext) -> None:
+def _register_crdb_none_adapters(context: AdaptContext) -> None:
     context.adapters.register_dumper(NoneType, CrdbNoneDumper)
 
 
@@ -123,7 +123,7 @@ for t in [
     TypeInfo("int8", 20, 1016, regtype="integer"),  # Alias integer -> int8
     TypeInfo('"char"', 18, 1002),  # special case, not generated
     # autogenerated: start
-    # Generated from CockroachDB 22.1.0
+    # Generated from CockroachDB 22.2.1
     TypeInfo("bit", 1560, 1561),
     TypeInfo("bool", 16, 1000, regtype="boolean"),
     TypeInfo("bpchar", 1042, 1014, regtype="character"),