Start integrating upper/db as a new ORM

internal/database/database.go

@@ -1,22 +1,24 @@
 package database
 
 import (
+	"database/sql"
+
 	"github.com/apex/log"
-	"github.com/jmoiron/sqlx"
-	_ "github.com/mattn/go-sqlite3" // this is needed to load the sqlite3 driver
 	"github.com/ooni/probe-cli/internal/bindata"
 	migrate "github.com/rubenv/sql-migrate"
+	"upper.io/db.v3/lib/sqlbuilder"
+	"upper.io/db.v3/sqlite"
 )
 
 // RunMigrations runs the database migrations
-func RunMigrations(db *sqlx.DB) error {
+func RunMigrations(db *sql.DB) error {
 	log.Debugf("running migrations")
 	migrations := &migrate.AssetMigrationSource{
 		Asset:    bindata.Asset,
 		AssetDir: bindata.AssetDir,
 		Dir:      "data/migrations",
 	}
-	n, err := migrate.Exec(db.DB, "sqlite3", migrations, migrate.Up)
+	n, err := migrate.Exec(db, "sqlite3", migrations, migrate.Up)
 	if err != nil {
 		return err
 	}
@@ -25,15 +27,15 @@ func RunMigrations(db *sqlx.DB) error {
 }
 
 // Connect to the database
-func Connect(path string) (db *sqlx.DB, err error) {
-	db, err = sqlx.Connect("sqlite3", path)
-	if err != nil {
-		return
+func Connect(path string) (db sqlbuilder.Database, err error) {
+	settings := sqlite.ConnectionURL{
+		Database: path,
 	}
+	sess, err := sqlite.Open(settings)
 
-	err = RunMigrations(db)
+	err = RunMigrations(sess.Driver().(*sql.DB))
 	if err != nil {
 		db = nil
 	}
-	return
+	return sess, err
 }