From e6364407a9c0ce474e22a6bacb70da3225251fae Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Fri, 12 Aug 2016 11:39:10 +0200 Subject: [PATCH] cmd/stdiscosrv: Fix index creation checks on startup --- cmd/stdiscosrv/psql.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/stdiscosrv/psql.go b/cmd/stdiscosrv/psql.go index 9f6b6b37..cb69df9c 100644 --- a/cmd/stdiscosrv/psql.go +++ b/cmd/stdiscosrv/psql.go @@ -27,8 +27,9 @@ func postgresSetup(db *sql.DB) error { return err } + var tmp string row := db.QueryRow(`SELECT 'DevicesDeviceIDIndex'::regclass`) - if err = row.Scan(nil); err != nil { + if err = row.Scan(&tmp); err != nil { _, err = db.Exec(`CREATE INDEX DevicesDeviceIDIndex ON Devices (DeviceID)`) } if err != nil { @@ -36,7 +37,7 @@ func postgresSetup(db *sql.DB) error { } row = db.QueryRow(`SELECT 'DevicesSeenIndex'::regclass`) - if err = row.Scan(nil); err != nil { + if err = row.Scan(&tmp); err != nil { _, err = db.Exec(`CREATE INDEX DevicesSeenIndex ON Devices (Seen)`) } if err != nil { @@ -53,7 +54,7 @@ func postgresSetup(db *sql.DB) error { } row = db.QueryRow(`SELECT 'AddressesDeviceIDSeenIndex'::regclass`) - if err = row.Scan(nil); err != nil { + if err = row.Scan(&tmp); err != nil { _, err = db.Exec(`CREATE INDEX AddressesDeviceIDSeenIndex ON Addresses (DeviceID, Seen)`) } if err != nil { @@ -61,7 +62,7 @@ func postgresSetup(db *sql.DB) error { } row = db.QueryRow(`SELECT 'AddressesDeviceIDAddressIndex'::regclass`) - if err = row.Scan(nil); err != nil { + if err = row.Scan(&tmp); err != nil { _, err = db.Exec(`CREATE INDEX AddressesDeviceIDAddressIndex ON Addresses (DeviceID, Address)`) } if err != nil {