Postgres support

internal/manager/config/config.go

@@ -51,7 +51,6 @@ const (
 	DefaultMaxSessionAge = 60 * 60 * 1 // 1 hours
 
 	Database                 = "database"
-	DatabaseType             = "database_type"
 	DatabaseConnectionString = "database_string"
 
 	Exclude      = "exclude"
@@ -697,10 +696,6 @@ func (i *Config) GetDatabasePath() string {
 	return i.getString(Database)
 }
 
-func (i *Config) GetDatabaseType() string {
-	return i.getString(DatabaseType)
-}
-
 func (i *Config) GetDatabaseConnectionString() string {
 	return i.getString(DatabaseConnectionString)
 }

internal/manager/init.go

@@ -38,13 +38,10 @@ func Initialize(cfg *config.Config, l *log.Logger) (*Manager, error) {
 	var db *sqlite.Database
 
 	{
-		var dbType = sqlite.DatabaseType(strings.ToUpper(cfg.GetDatabaseType()))
+		var dbType = sqlite.SqliteBackend
 
-		switch dbType {
-		case sqlite.SqliteBackend, sqlite.PostgresBackend:
-			// Valid case
-		default:
-			dbType = sqlite.SqliteBackend
+		if strings.HasPrefix(strings.ToUpper(cfg.GetDatabaseConnectionString()), string(sqlite.PostgresBackend)) {
+			dbType = sqlite.PostgresBackend
 		}
 
 		switch dbType {

pkg/sqlite/database.go

@@ -253,22 +253,6 @@ func (db *Database) Open() error {
 	return nil
 }
 
-// lock locks the database for writing. This method will block until the lock is acquired.
-func (db *Database) lock() {
-	db.lockChan <- struct{}{}
-}
-
-// unlock unlocks the database
-func (db *Database) unlock() {
-	// will block the caller if the lock is not held, so check first
-	select {
-	case <-db.lockChan:
-		return
-	default:
-		panic("database is not locked")
-	}
-}
-
 func (db *Database) Close() error {
 	db.lock()
 	defer db.unlock()

pkg/sqlite/database_postgres.go

@@ -17,7 +17,6 @@ func NewPostgresDatabase(dbConnector string) *Database {
 
 	db := &PostgresDB{
 		storeRepository: newDatabase(),
-		lockChan:        make(chan struct{}, 1),
 		dbConfig:        dbConnector,
 	}
 	db.dbInterface = db
@@ -27,6 +26,10 @@ func NewPostgresDatabase(dbConnector string) *Database {
 	return (*Database)(db)
 }
 
+// Does nothing
+func (db *PostgresDB) lock()   {}
+func (db *PostgresDB) unlock() {}
+
 func (db *PostgresDB) DatabaseType() DatabaseType {
 	return PostgresBackend
 }

pkg/sqlite/database_sqlite.go

@@ -36,6 +36,22 @@ func NewSQLiteDatabase(dbPath string) *Database {
 	return (*Database)(db)
 }
 
+// lock locks the database for writing. This method will block until the lock is acquired.
+func (db *SQLiteDB) lock() {
+	db.lockChan <- struct{}{}
+}
+
+// unlock unlocks the database
+func (db *SQLiteDB) unlock() {
+	// will block the caller if the lock is not held, so check first
+	select {
+	case <-db.lockChan:
+		return
+	default:
+		panic("database is not locked")
+	}
+}
+
 func (db *SQLiteDB) DatabaseType() DatabaseType {
 	return SqliteBackend
 }

pkg/sqlite/gallery_filter.go

@@ -378,12 +378,12 @@ func (qb *galleryFilterHandler) performerFavoriteCriterionHandler(performerfavor
 			if *performerfavorite {
 				// contains at least one favorite
 				f.addLeftJoin("performers", "", "performers.id = performers_galleries.performer_id")
-				f.addWhere(fmt.Sprintf("performers.favorite = %s", getDBBoolean(true)))
+				f.addWhere("performers.favorite = " + getDBBoolean(true))
 			} else {
 				// contains zero favorites
-				f.addLeftJoin(fmt.Sprintf(`(SELECT performers_galleries.gallery_id as id FROM performers_galleries 
+				f.addLeftJoin(`(SELECT performers_galleries.gallery_id as id FROM performers_galleries 
 JOIN performers ON performers.id = performers_galleries.performer_id
-GROUP BY performers_galleries.gallery_id HAVING SUM(performers.favorite) = %s)`, getDBBoolean(false)), "nofaves", "galleries.id = nofaves.id")
+GROUP BY performers_galleries.gallery_id HAVING SUM(performers.favorite) = `+getDBBoolean(false)+")", "nofaves", "galleries.id = nofaves.id")
 				f.addWhere("performers_galleries.gallery_id IS NULL OR nofaves.id IS NOT NULL")
 			}
 		}

pkg/sqlite/image_filter.go

@@ -2,7 +2,6 @@ package sqlite
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/stashapp/stash/pkg/models"
 )
@@ -255,12 +254,12 @@ func (qb *imageFilterHandler) performerFavoriteCriterionHandler(performerfavorit
 			if *performerfavorite {
 				// contains at least one favorite
 				f.addLeftJoin("performers", "", "performers.id = performers_images.performer_id")
-				f.addWhere(fmt.Sprintf("performers.favorite = %s", getDBBoolean(true)))
+				f.addWhere("performers.favorite = " + getDBBoolean(true))
 			} else {
 				// contains zero favorites
-				f.addLeftJoin(fmt.Sprintf(`(SELECT performers_images.image_id as id FROM performers_images
+				f.addLeftJoin(`(SELECT performers_images.image_id as id FROM performers_images
 JOIN performers ON performers.id = performers_images.performer_id
-GROUP BY performers_images.image_id HAVING SUM(performers.favorite) = %s)`, getDBBoolean(false)), "nofaves", "images.id = nofaves.id")
+GROUP BY performers_images.image_id HAVING SUM(performers.favorite) = `+getDBBoolean(false)+")", "nofaves", "images.id = nofaves.id")
 				f.addWhere("performers_images.image_id IS NULL OR nofaves.id IS NOT NULL")
 			}
 		}

pkg/sqlite/migrationsPostgres/1_initial.up.sql

@@ -96,7 +96,10 @@ CREATE TABLE IF NOT EXISTS images (
   organized boolean not null default FALSE,
   created_at timestamp not null,
   updated_at timestamp not null, 
-  date date, code text, photographer text, details text,
+  date date, 
+  code text, 
+  photographer text, 
+  details text,
   foreign key(studio_id) references studios(id) on delete SET NULL
 );
 CREATE TABLE image_urls (

pkg/sqlite/repository.go

@@ -461,10 +461,10 @@ func idToIndexMap(ids []int) map[int]int {
 func (r *filesRepository) getMany(ctx context.Context, ids []int, primaryOnly bool) ([][]models.FileID, error) {
 	var primaryClause string
 	if primaryOnly {
-		primaryClause = fmt.Sprintf(" AND \"primary\" = %s", getDBBoolean(true))
+		primaryClause = ` AND "primary" = ` + getDBBoolean(true)
 	}
 
-	query := fmt.Sprintf("SELECT %s as id, file_id, \"primary\" from %s WHERE %[1]s IN %[3]s%s", r.idColumn, r.tableName, getInBinding(len(ids)), primaryClause)
+	query := fmt.Sprintf(`SELECT %s as id, file_id, "primary" from %s WHERE %[1]s IN %[3]s%s`, r.idColumn, r.tableName, getInBinding(len(ids)), primaryClause)
 
 	idi := make([]interface{}, len(ids))
 	for i, id := range ids {
@@ -505,7 +505,7 @@ func (r *filesRepository) getMany(ctx context.Context, ids []int, primaryOnly bo
 }
 
 func (r *filesRepository) get(ctx context.Context, id int) ([]models.FileID, error) {
-	query := fmt.Sprintf("SELECT file_id, \"primary\" from %s WHERE %s = ?", r.tableName, r.idColumn)
+	query := fmt.Sprintf(`SELECT file_id, "primary" from %s WHERE %s = ?`, r.tableName, r.idColumn)
 
 	type relatedFile struct {
 		FileID  models.FileID `db:"file_id"`

pkg/sqlite/scene_filter.go

@@ -455,12 +455,12 @@ func (qb *sceneFilterHandler) performerFavoriteCriterionHandler(performerfavorit
 			if *performerfavorite {
 				// contains at least one favorite
 				f.addLeftJoin("performers", "", "performers.id = performers_scenes.performer_id")
-				f.addWhere(fmt.Sprintf("performers.favorite = %s", getDBBoolean(true)))
+				f.addWhere("performers.favorite = " + getDBBoolean(true))
 			} else {
 				// contains zero favorites
-				f.addLeftJoin(fmt.Sprintf(`(SELECT performers_scenes.scene_id as id FROM performers_scenes
+				f.addLeftJoin(`(SELECT performers_scenes.scene_id as id FROM performers_scenes
 JOIN performers ON performers.id = performers_scenes.performer_id
-GROUP BY performers_scenes.scene_id HAVING SUM(performers.favorite) = %s)`, getDBBoolean(false)), "nofaves", "scenes.id = nofaves.id")
+GROUP BY performers_scenes.scene_id HAVING SUM(performers.favorite) = `+getDBBoolean(false)+")", "nofaves", "scenes.id = nofaves.id")
 				f.addWhere("performers_scenes.scene_id IS NULL OR nofaves.id IS NOT NULL")
 			}
 		}

pkg/sqlite/tag.go

@@ -584,7 +584,7 @@ func (qb *TagStore) QueryForAutoTag(ctx context.Context, words []string) ([]*mod
 
 	whereOr := "(" + strings.Join(whereClauses, " OR ") + ")"
 	where := strings.Join([]string{
-		fmt.Sprintf("tags.ignore_auto_tag = %s", getDBBoolean(false)),
+		"tags.ignore_auto_tag = " + getDBBoolean(false),
 		whereOr,
 	}, " AND ")
 	return qb.queryTags(ctx, query+" WHERE "+where, args)