GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CrateDB support (regression in ab9a1af) 

See https://github.com/jackc/pgx/issues/320#issuecomment-338457176
pull/352/head
Felix Geisendörfer 2017-11-09 13:53:58 +01:00
parent f6d37536c4
commit 4dec986171
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conn.go
View File

@ -396,11 +396,13 @@ where (
t.typtype in('b', 'p', 'r', 'e') t.typtype in('b', 'p', 'r', 'e')
and (base_type.oid is null or base_type.typtype in('b', 'p', 'r')) and (base_type.oid is null or base_type.typtype in('b', 'p', 'r'))
)`) )`)
isCrateDB := false
if err != nil { if err != nil {
// Check if CrateDB specific approach might still allow us to connect. // Check if CrateDB specific approach might still allow us to connect.
if rows, err = c.crateDBTypesQuery(err); err != nil { if rows, err = c.crateDBTypesQuery(err); err != nil {
return err return err
} }
isCrateDB = true
} }
for rows.Next() { for rows.Next() {
@ -420,6 +422,11 @@ where (
c.ConnInfo = pgtype.NewConnInfo() c.ConnInfo = pgtype.NewConnInfo()
c.ConnInfo.InitializeDataTypes(nameOIDs) c.ConnInfo.InitializeDataTypes(nameOIDs)
if isCrateDB {
// CrateDB does not support enums (initConnInfoEnumArray), so we return
// early here.
return nil
}
return c.initConnInfoEnumArray() return c.initConnInfoEnumArray()
} }