From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sun, 29 Mar 2020 01:39:04 +0000 (+1300)
Subject: Fixed oids order
X-Git-Tag: 3.0.dev0~654
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af61900cbe491a5270d4873bf8c72937f3b27292;p=thirdparty%2Fpsycopg.git

Fixed oids order
---

diff --git a/psycopg3/types/oids.py b/psycopg3/types/oids.py
index 3f1e9fa54..9775a49d1 100644
--- a/psycopg3/types/oids.py
+++ b/psycopg3/types/oids.py
@@ -19,29 +19,29 @@ _oids_table = [
     ("anyenum", 3500, 0, "anyenum"),
     ("anynonarray", 2776, 0, "anynonarray"),
     ("anyrange", 3831, 0, "anyrange"),
-    ("int8", 20, 1016, "bigint"),
     ("bit", 1560, 1561, "bit"),
-    ("varbit", 1562, 1563, "bit varying"),
     ("bool", 16, 1000, "boolean"),
     ("box", 603, 1020, "box"),
+    ("bpchar", 1042, 1014, "character"),
     ("bytea", 17, 1001, "bytea"),
     ("char", 18, 1002, '"char"'),
-    ("bpchar", 1042, 1014, "character"),
-    ("varchar", 1043, 1015, "character varying"),
     ("cid", 29, 1012, "cid"),
     ("cidr", 650, 651, "cidr"),
     ("circle", 718, 719, "circle"),
     ("cstring", 2275, 1263, "cstring"),
     ("date", 1082, 1182, "date"),
     ("daterange", 3912, 3913, "daterange"),
-    ("float8", 701, 1022, "double precision"),
     ("event_trigger", 3838, 0, "event_trigger"),
+    ("float4", 700, 1021, "real"),
+    ("float8", 701, 1022, "double precision"),
     ("gtsvector", 3642, 3644, "gtsvector"),
     ("inet", 869, 1041, "inet"),
+    ("int2", 21, 1005, "smallint"),
     ("int2vector", 22, 1006, "int2vector"),
+    ("int4", 23, 1007, "integer"),
     ("int4range", 3904, 3905, "int4range"),
+    ("int8", 20, 1016, "bigint"),
     ("int8range", 3926, 3927, "int8range"),
-    ("int4", 23, 1007, "integer"),
     ("internal", 2281, 0, "internal"),
     ("interval", 1186, 1187, "interval"),
     ("json", 114, 199, "json"),
@@ -60,17 +60,15 @@ _oids_table = [
     ("path", 602, 1019, "path"),
     ("point", 600, 1017, "point"),
     ("polygon", 604, 1027, "polygon"),
-    ("float4", 700, 1021, "real"),
     ("record", 2249, 2287, "record"),
     ("refcursor", 1790, 2201, "refcursor"),
     ("reltime", 703, 1024, "reltime"),
-    ("int2", 21, 1005, "smallint"),
     ("smgr", 210, 0, "smgr"),
     ("text", 25, 1009, "text"),
     ("tid", 27, 1010, "tid"),
+    ("time", 1083, 1183, "time without time zone"),
     ("timestamp", 1114, 1115, "timestamp without time zone"),
     ("timestamptz", 1184, 1185, "timestamp with time zone"),
-    ("time", 1083, 1183, "time without time zone"),
     ("timetz", 1266, 1270, "time with time zone"),
     ("tinterval", 704, 1025, "tinterval"),
     ("trigger", 2279, 0, "trigger"),
@@ -81,6 +79,8 @@ _oids_table = [
     ("txid_snapshot", 2970, 2949, "txid_snapshot"),
     ("unknown", 705, 0, "unknown"),
     ("uuid", 2950, 2951, "uuid"),
+    ("varbit", 1562, 1563, "bit varying"),
+    ("varchar", 1043, 1015, "character varying"),
     ("void", 2278, 0, "void"),
     ("xid", 28, 1011, "xid"),
     ("xml", 142, 143, "xml"),
@@ -111,7 +111,7 @@ select format(
     from pg_type
     where oid < 10000
     and typname !~ all('{^(_|pg_|reg),_handler$}')
-    order by replace(oid::regtype::text, '"', '')
+    order by typname
 """,
     ]