incorporate postgres patch with minor changes

database/manager.go

@@ -1,14 +1,18 @@
 package database
 
 import (
+	"net/url"
 	"path/filepath"
+	"strings"
 	"sync"
-	"github.com/jinzhu/gorm"
+
 	u "git.eeqj.de/sneak/goutil"
+	"github.com/golang/groupcache/lru"
+	"github.com/jinzhu/gorm"
+	_ "github.com/jinzhu/gorm/dialects/postgres"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
-	"github.com/golang/groupcache/lru"
 )
 
 const cacheEntries = 1000000
@@ -28,7 +32,7 @@ func New() *Manager {
 }
 
 func (m *Manager) init() {
-	m.open()
+	m.open(viper.GetString("DBURL"))
 	// breaks stuff, do not use:
 	//m.db.SingularTable(true)
 	m.db.LogMode(false)
@@ -38,22 +42,55 @@ func (m *Manager) init() {
 	m.recentlyInsertedTootHashCache = lru.New(cacheEntries)
 }
 
-func (m *Manager) open() {
+func (m *Manager) open(dbURL string) {
 	log.Info().Msg("opening database")
-	dirname := filepath.Dir(viper.GetString("DbStorageLocation"))
-	err := u.Mkdirp(dirname)
+	dsn, err := url.Parse(dbURL)
 	if err != nil {
 		log.Panic().
 			Err(err).
-			Msg("db path erro")
+			Msg("error parsing dbURL")
+	}
+	log.Info().
+		Str("scheme", dsn.Scheme).
+		Str("user", dsn.User.Username()).
+		Str("host", dsn.Host).
+		Str("db", dsn.Path).
+		Str("args", dsn.RawQuery).
+		Msg("db connection values")
+	switch {
+	case strings.HasPrefix(dbURL, "postgres://"):
+		log.Info().Msg("using postgres db")
+		db, err := gorm.Open("postgres", dbURL)
+		if err != nil {
+			log.Panic().
+				Err(err).
+				Msg("failed to open database")
+		}
+		m.db = db
+	case strings.HasPrefix(dbURL, "sqlite://"):
+		log.Info().Msg("using sqlite db")
+		if !strings.HasSuffix(dbURL, ":memory:") {
+			dirname := filepath.Dir(strings.TrimPrefix(dbURL, "sqlite://"))
+			err := u.Mkdirp(dirname)
+			if err != nil {
+				log.Panic().
+					Err(err).
+					Msg("db path error")
+			}
+		}
+		db, err := gorm.Open("sqlite3", strings.TrimPrefix(dbURL, "sqlite://"))
+		if err != nil {
+			log.Panic().
+				Err(err).
+				Str("dbURL", dbURL).
+				Msg("failed to open database")
+		}
+		m.db = db
+	default:
+		log.Panic().
+			Str("driver", dsn.Scheme).
+			Msg("unsupported driver in database url, must be 'postgres' or 'sqlite'")
 	}
 
-	db, err := gorm.Open("sqlite3", viper.GetString("DbStorageLocation"))
-	if err != nil {
-		log.Panic().
-			Err(err).
-			Msg("failed to open database")
-	}
-	m.db = db
 	m.doMigrations()
 }

database/storageconnector.go

@@ -7,7 +7,7 @@ import (
 	"git.eeqj.de/sneak/feta/toot"
 	"github.com/google/uuid"
 	hstg "github.com/grokify/html-strip-tags-go"
-	_ "github.com/jinzhu/gorm/dialects/sqlite"
+	_ "github.com/jinzhu/gorm/dialects/postgres"
 )
 
 func (m *Manager) TootInsertHashCacheSize() uint {