From 4dec98617103d40acfbf9df07725f27c12bc58bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Geisend=C3=B6rfer?= Date: Thu, 9 Nov 2017 13:53:58 +0100 Subject: [PATCH] Fix CrateDB support (regression in ab9a1af) See https://github.com/jackc/pgx/issues/320#issuecomment-338457176 --- conn.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conn.go b/conn.go index 073694fa..d86c4025 100644 --- a/conn.go +++ b/conn.go @@ -396,11 +396,13 @@ where ( t.typtype in('b', 'p', 'r', 'e') and (base_type.oid is null or base_type.typtype in('b', 'p', 'r')) )`) + isCrateDB := false if err != nil { // Check if CrateDB specific approach might still allow us to connect. if rows, err = c.crateDBTypesQuery(err); err != nil { return err } + isCrateDB = true } for rows.Next() { @@ -420,6 +422,11 @@ where ( c.ConnInfo = pgtype.NewConnInfo() c.ConnInfo.InitializeDataTypes(nameOIDs) + if isCrateDB { + // CrateDB does not support enums (initConnInfoEnumArray), so we return + // early here. + return nil + } return c.initConnInfoEnumArray() }