Rely on sqlx for driver independent bind vars

certdb/certdb.go

@@ -7,23 +7,23 @@ import (
 // CertificateRecord encodes a certificate and its metadata
 // that will be recorded in a database.
 type CertificateRecord struct {
-	Serial    string    `sql:"serial_number"`
-	AKI       string    `sql:"authority_key_identifier"`
-	CALabel   string    `sql:"ca_label"`
-	Status    string    `sql:"status"`
-	Reason    int       `sql:"reason"`
-	Expiry    time.Time `sql:"expiry"`
-	RevokedAt time.Time `sql:"revoked_at"`
-	PEM       string    `sql:"pem"`
+	Serial    string    `db:"serial_number"`
+	AKI       string    `db:"authority_key_identifier"`
+	CALabel   string    `db:"ca_label"`
+	Status    string    `db:"status"`
+	Reason    int       `db:"reason"`
+	Expiry    time.Time `db:"expiry"`
+	RevokedAt time.Time `db:"revoked_at"`
+	PEM       string    `db:"pem"`
 }
 
 // OCSPRecord encodes a OCSP response body and its metadata
 // that will be recorded in a database.
 type OCSPRecord struct {
-	Serial string    `sql:"serial_number"`
-	AKI    string    `sql:"authority_key_identifier"`
-	Body   string    `sql:"body"`
-	Expiry time.Time `sql:"expiry"`
+	Serial string    `db:"serial_number"`
+	AKI    string    `db:"authority_key_identifier"`
+	Body   string    `db:"body"`
+	Expiry time.Time `db:"expiry"`
 }
 
 // Accessor abstracts the CRUD of certdb objects from a DB.

certdb/dbconf/db_config.go

@@ -1,13 +1,14 @@
 package dbconf
 
 import (
-	"database/sql"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 
 	cferr "github.com/cloudflare/cfssl/errors"
 	"github.com/cloudflare/cfssl/log"
+
+	"github.com/jmoiron/sqlx"
 )
 
 // DBConfig contains the database driver name and configuration to be passed to Open
@@ -45,12 +46,12 @@ func LoadFile(path string) (cfg *DBConfig, err error) {
 }
 
 // DBFromConfig opens a sql.DB from settings in a db config file
-func DBFromConfig(path string) (db *sql.DB, err error) {
+func DBFromConfig(path string) (db *sqlx.DB, err error) {
 	var dbCfg *DBConfig
 	dbCfg, err = LoadFile(path)
 	if err != nil {
 		return nil, err
 	}
 
-	return sql.Open(dbCfg.DriverName, dbCfg.DataSourceName)
+	return sqlx.Open(dbCfg.DriverName, dbCfg.DataSourceName)
 }