Register array types properly

porsager · porsager · commit 7d3ce4b19a59 · 2020-01-31T16:37:08.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -221,24 +221,27 @@ function Postgres(a, b) {
     return arrayTypesPromise || (arrayTypesPromise =
       new Promise((resolve, reject) => {
         send(connection, { resolve, reject, raw: true }, `
-          select oid, typelem
-          from pg_catalog.pg_type
-          where typcategory = 'A'
+          select b.oid, b.typarray
+          from pg_catalog.pg_type a
+          left join pg_catalog.pg_type b on b.oid = a.typelem
+          where a.typcategory = 'A' and b.typcategory != 'C'
+          group by b.oid, b.typarray
+          order by b.oid
         `)
       }).then(types => {
-        types.forEach(({ oid, typelem }) => addArrayType(oid, typelem))
+        types.forEach(({ oid, typarray }) => addArrayType(oid, typarray))
         ready = true
       })
     )
   }
 
-  function addArrayType(oid, typelem) {
-    const parser = options.parsers[typelem]
+  function addArrayType(oid, typarray) {
+    const parser = options.parsers[oid]
 
-    typeArrayMap[typelem] = oid
-    options.parsers[oid] = (xs) => arrayParser(xs, parser)
-    options.parsers[oid].array = true
-    options.serializers[oid] = (xs) => arraySerializer(xs, options.serializers[typelem])
+    typeArrayMap[oid] = typarray
+    options.parsers[typarray] = (xs) => arrayParser(xs, parser)
+    options.parsers[typarray].array = true
+    options.serializers[typarray] = (xs) => arraySerializer(xs, options.serializers[oid])
   }
 
   function addTypes(sql, connection) {
