Make TYPEMAP be stable and avoid extra endline at the end of pgtypes.pxi

Author: vitaly-burovoy

asyncpg/protocol/pgtypes.pxi

@@ -98,85 +98,85 @@ DEF REGROLEOID = 4096
 cdef ARRAY_TYPES = (_TEXTOID, _OIDOID,)
 
 TYPEMAP = {
-    NUMERICOID: 'numeric',
-    INTERVALOID: 'interval',
-    TIMETZOID: 'timetz',
-    CHAROID: 'char',
-    FDW_HANDLEROID: 'fdw_handler',
-    REGTYPEOID: 'regtype',
-    REGOPEROID: 'regoper',
+    ABSTIMEOID: 'abstime',
     ACLITEMOID: 'aclitem',
-    TXID_SNAPSHOTOID: 'txid_snapshot',
-    REGDICTIONARYOID: 'regdictionary',
-    POINTOID: 'point',
-    OIDOID: 'oid',
-    PG_NODE_TREEOID: 'pg_node_tree',
-    REFCURSOROID: 'refcursor',
-    REGNAMESPACEOID: 'regnamespace',
-    TIMESTAMPOID: 'timestamp',
-    BYTEAOID: 'bytea',
-    REGCONFIGOID: 'regconfig',
-    UUIDOID: 'uuid',
-    FLOAT4OID: 'float4',
-    SMGROID: 'smgr',
-    BOOLOID: 'bool',
-    INT4OID: 'int4',
-    MACADDROID: 'macaddr',
-    TSM_HANDLEROID: 'tsm_handler',
-    REGPROCEDUREOID: 'regprocedure',
-    RELTIMEOID: 'reltime',
-    DATEOID: 'date',
-    _OIDOID: 'oid[]',
-    TSQUERYOID: 'tsquery',
-    LINEOID: 'line',
-    PG_LSNOID: 'pg_lsn',
-    JSONOID: 'json',
-    POLYGONOID: 'polygon',
-    XMLOID: 'xml',
-    INT2OID: 'int2',
-    TINTERVALOID: 'tinterval',
     ANYARRAYOID: 'anyarray',
-    NAMEOID: 'name',
-    TIDOID: 'tid',
+    ANYELEMENTOID: 'anyelement',
+    ANYENUMOID: 'anyenum',
+    ANYNONARRAYOID: 'anynonarray',
+    ANYOID: 'any',
     ANYRANGEOID: 'anyrange',
+    BITOID: 'bit',
+    BOOLOID: 'bool',
+    BOXOID: 'box',
+    BPCHAROID: 'bpchar',
+    BYTEAOID: 'bytea',
+    CHAROID: 'char',
     CIDOID: 'cid',
-    TIMESTAMPTZOID: 'timestamptz',
     CIDROID: 'cidr',
-    REGCLASSOID: 'regclass',
-    INT8OID: 'int8',
+    CIRCLEOID: 'circle',
     CSTRINGOID: 'cstring',
+    DATEOID: 'date',
+    EVENT_TRIGGEROID: 'event_trigger',
+    FDW_HANDLEROID: 'fdw_handler',
+    FLOAT4OID: 'float4',
     FLOAT8OID: 'float8',
-    REGROLEOID: 'regrole',
-    CIRCLEOID: 'circle',
-    ANYNONARRAYOID: 'anynonarray',
     GTSVECTOROID: 'gtsvector',
-    ABSTIMEOID: 'abstime',
-    PATHOID: 'path',
-    OPAQUEOID: 'opaque',
-    ANYOID: 'any',
-    TIMEOID: 'time',
-    ANYENUMOID: 'anyenum',
-    VOIDOID: 'void',
-    ANYELEMENTOID: 'anyelement',
-    LSEGOID: 'lseg',
-    LANGUAGE_HANDLEROID: 'language_handler',
     INETOID: 'inet',
-    REGPROCOID: 'regproc',
-    EVENT_TRIGGEROID: 'event_trigger',
-    TEXTOID: 'text',
-    BOXOID: 'box',
+    INT2OID: 'int2',
+    INT4OID: 'int4',
+    INT8OID: 'int8',
     INTERNALOID: 'internal',
-    VARBITOID: 'varbit',
-    XIDOID: 'xid',
-    UNKNOWNOID: 'unknown',
-    PG_DDL_COMMANDOID: 'pg_ddl_command',
-    BITOID: 'bit',
+    INTERVALOID: 'interval',
+    JSONBOID: 'jsonb',
+    JSONOID: 'json',
+    LANGUAGE_HANDLEROID: 'language_handler',
+    LINEOID: 'line',
+    LSEGOID: 'lseg',
+    MACADDROID: 'macaddr',
     MONEYOID: 'money',
-    VARCHAROID: 'varchar',
-    TSVECTOROID: 'tsvector',
-    _TEXTOID: 'text[]',
+    NAMEOID: 'name',
+    NUMERICOID: 'numeric',
+    OIDOID: 'oid',
+    OPAQUEOID: 'opaque',
+    PATHOID: 'path',
+    PG_DDL_COMMANDOID: 'pg_ddl_command',
+    PG_LSNOID: 'pg_lsn',
+    PG_NODE_TREEOID: 'pg_node_tree',
+    POINTOID: 'point',
+    POLYGONOID: 'polygon',
     RECORDOID: 'record',
-    JSONBOID: 'jsonb',
+    REFCURSOROID: 'refcursor',
+    REGCLASSOID: 'regclass',
+    REGCONFIGOID: 'regconfig',
+    REGDICTIONARYOID: 'regdictionary',
+    REGNAMESPACEOID: 'regnamespace',
     REGOPERATOROID: 'regoperator',
+    REGOPEROID: 'regoper',
+    REGPROCEDUREOID: 'regprocedure',
+    REGPROCOID: 'regproc',
+    REGROLEOID: 'regrole',
+    REGTYPEOID: 'regtype',
+    RELTIMEOID: 'reltime',
+    SMGROID: 'smgr',
+    TEXTOID: 'text',
+    TIDOID: 'tid',
+    TIMEOID: 'time',
+    TIMESTAMPOID: 'timestamp',
+    TIMESTAMPTZOID: 'timestamptz',
+    TIMETZOID: 'timetz',
+    TINTERVALOID: 'tinterval',
     TRIGGEROID: 'trigger',
-    BPCHAROID: 'bpchar'}
+    TSM_HANDLEROID: 'tsm_handler',
+    TSQUERYOID: 'tsquery',
+    TSVECTOROID: 'tsvector',
+    TXID_SNAPSHOTOID: 'txid_snapshot',
+    UNKNOWNOID: 'unknown',
+    UUIDOID: 'uuid',
+    VARBITOID: 'varbit',
+    VARCHAROID: 'varchar',
+    VOIDOID: 'void',
+    XIDOID: 'xid',
+    XMLOID: 'xml',
+    _OIDOID: 'oid[]',
+    _TEXTOID: 'text[]'}

tools/generate_type_map.py

@@ -70,8 +70,8 @@ async def runner(args):
 
     buf += '\n\nARRAY_TYPES = ({},)'.format(', '.join(array_types))
 
-    f_typemap = ('{}: {!r}'.format(dn, n) for dn, n in typemap.items())
-    buf += '\n\nTYPEMAP = {{\n    {}}}\n'.format(',\n    '.join(f_typemap))
+    f_typemap = ('{}: {!r}'.format(dn, n) for dn, n in sorted(typemap.items()))
+    buf += '\n\nTYPEMAP = {{\n    {}}}'.format(',\n    '.join(f_typemap))
 
     print(buf)