Shared tests between sqlite and postgres

Author: NodudeWasTaken

internal/autotag/integration_test.go

@@ -45,43 +45,49 @@ func testTeardown(db database.Database) {
 	}
 }
 
-func getNewDB(databaseFile string) database.Database {
-	if dbUrl, valid := os.LookupEnv("PGSQL_TEST"); valid {
+func IsPostgresTest() *string {
+	if val, ok := os.LookupEnv("PGSQL_TEST"); ok {
+		return &val
+	}
+	return nil
+}
+
+func getNewDB() {
+	if val := IsPostgresTest(); val != nil {
 		fmt.Printf("Postgres backend for tests detected\n")
 		db = postgres.NewDatabase()
 
-		if err := db.Open(dbUrl); err != nil {
+		if err := db.Open(*val); err != nil {
 			panic(fmt.Sprintf("Could not initialize database: %s", err.Error()))
 		}
-		return db
-	}
+	} else {
+		fmt.Printf("SQLite backend for tests detected\n")
+		db = sqlite.NewDatabase()
+
+		// create the database file
+		f, err := os.CreateTemp("", "*.sqlite")
+		if err != nil {
+			panic(fmt.Sprintf("Could not create temporary file: %s", err.Error()))
+		}
 
-	fmt.Printf("SQLite backend for tests detected\n")
-	db = sqlite.NewDatabase()
+		f.Close()
+		databaseFile := f.Name()
 
-	if err := db.Open(databaseFile); err != nil {
-		panic(fmt.Sprintf("Could not initialize database: %s", err.Error()))
+		if err := db.Open(databaseFile); err != nil {
+			panic(fmt.Sprintf("Could not initialize database: %s", err.Error()))
+		}
 	}
-	return db
 }
 
 func runTests(m *testing.M) int {
-	// create the database file
-	f, err := os.CreateTemp("", "*.sqlite")
-	if err != nil {
-		panic(fmt.Sprintf("Could not create temporary file: %s", err.Error()))
-	}
-
-	f.Close()
-	databaseFile := f.Name()
-	db = getNewDB(databaseFile)
+	getNewDB()
 
 	r = db.Repository()
 
 	// defer close and delete the database
 	defer testTeardown(db)
 
-	err = populateDB()
+	err := populateDB()
 	if err != nil {
 		panic(fmt.Sprintf("Could not populate database: %s", err.Error()))
 	} else {

pkg/postgres/anonymise_test.go renamed to pkg/database/anonymise_test.go

@@ -1,16 +1,24 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"
 	"os"
 	"testing"
 
 	"github.com/stashapp/stash/pkg/postgres"
+	"github.com/stashapp/stash/pkg/sqlite"
 )
 
+func IsPostgresTest() *string {
+	if val, ok := os.LookupEnv("PGSQL_TEST"); ok {
+		return &val
+	}
+	return nil
+}
+
 func TestAnonymiser_Anonymise(t *testing.T) {
 	f, err := os.CreateTemp("", "*.sqlite")
 	if err != nil {
@@ -22,7 +30,13 @@ func TestAnonymiser_Anonymise(t *testing.T) {
 	defer os.Remove(f.Name())
 
 	// use existing database
-	anonymiser, err := postgres.NewAnonymiser(db, f.Name())
+	var anonymiser *sqlite.Anonymiser
+	if val := IsPostgresTest(); val != nil {
+		anonymiser, err = postgres.NewAnonymiser(db.(*postgres.Database), f.Name())
+	} else {
+		anonymiser, err = sqlite.NewAnonymiser(db.(*sqlite.Database), f.Name())
+	}
+
 	if err != nil {
 		t.Errorf("Could not create anonymiser: %v", err)
 		return

pkg/postgres/blob_test.go renamed to pkg/database/blob_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"

pkg/sqlite/custom_fields_test.go renamed to pkg/database/custom_fields_test.go

@@ -1,7 +1,7 @@
-//go:build integration
-// +build integration
+//go:build db_integration
+// +build db_integration
 
-package sqlite_test
+package database_test
 
 import (
 	"context"

pkg/postgres/file_filter_test.go renamed to pkg/database/file_filter_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"

pkg/postgres/file_test.go renamed to pkg/database/file_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"

pkg/postgres/folder_filter_test.go renamed to pkg/database/folder_filter_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"

pkg/postgres/folder_test.go renamed to pkg/database/folder_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"

pkg/postgres/gallery_chapter_test.go renamed to pkg/database/gallery_chapter_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"

pkg/postgres/gallery_test.go renamed to pkg/database/gallery_test.go

@@ -1,7 +1,7 @@
-//go:build pg_integration
-// +build pg_integration
+//go:build db_integration
+// +build db_integration
 
-package postgres_test
+package database_test
 
 import (
 	"context"
@@ -506,7 +506,7 @@ func Test_galleryQueryBuilder_UpdatePartial(t *testing.T) {
 				CreatedAt:    createdAt,
 				UpdatedAt:    updatedAt,
 				SceneIDs:     models.NewRelatedIDs([]int{sceneIDs[sceneIdxWithGallery]}),
-				TagIDs:       models.NewRelatedIDs([]int{tagIDs[tagIdx1WithGallery], tagIDs[tagIdx1WithDupName]}),
+				TagIDs:       models.NewRelatedIDs([]int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithGallery]}),
 				PerformerIDs: models.NewRelatedIDs([]int{performerIDs[performerIdx1WithGallery], performerIDs[performerIdx1WithDupName]}),
 			},
 			false,