Fingerprints fix for postgres

pkg/sqlite/file.go

@@ -549,6 +549,8 @@ func (qb *FileStore) getMany(ctx context.Context, q *goqu.SelectDataset) ([]mode
 			return err
 		}
 
+		f.fingerprintQueryRow.correct()
+
 		rows = append(rows, f)
 		return nil
 	}); err != nil {

pkg/sqlite/fingerprint.go

@@ -3,6 +3,8 @@ package sqlite
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"strings"
 
 	"github.com/doug-martin/goqu/v9"
 	"github.com/doug-martin/goqu/v9/exp"
@@ -23,6 +25,19 @@ func (r fingerprintQueryRow) valid() bool {
 	return r.Type.Valid
 }
 
+func (r *fingerprintQueryRow) correct() {
+	if !r.Type.Valid || strings.ToLower(r.Type.String) != "phash" {
+		return
+	}
+	switch r.Fingerprint.(type) {
+	case string:
+		i, err := strconv.ParseInt(r.Fingerprint.(string), 10, 64)
+		if err == nil {
+			r.Fingerprint = i
+		}
+	}
+}
+
 func (r *fingerprintQueryRow) resolve() models.Fingerprint {
 	return models.Fingerprint{
 		Type:        r.Type.String,

pkg/sqlite/scene_test.go

@@ -75,6 +75,13 @@ func loadSceneRelationships(ctx context.Context, expected models.Scene, actual *
 	return nil
 }
 
+func sortScene(copy *models.Scene) {
+	// Ordering is not ensured
+	copy.GalleryIDs.Sort()
+	copy.TagIDs.Sort()
+	copy.PerformerIDs.Sort()
+}
+
 func Test_sceneQueryBuilder_Create(t *testing.T) {
 	var (
 		title        = "title"
@@ -267,6 +274,8 @@ func Test_sceneQueryBuilder_Create(t *testing.T) {
 				return
 			}
 
+			sortScene(&copy)
+			sortScene(&s)
 			assert.Equal(copy, s)
 
 			// ensure can find the scene
@@ -284,6 +293,7 @@ func Test_sceneQueryBuilder_Create(t *testing.T) {
 				t.Errorf("loadSceneRelationships() error = %v", err)
 				return
 			}
+			sortScene(found)
 			assert.Equal(copy, *found)
 
 			return
@@ -492,6 +502,8 @@ func Test_sceneQueryBuilder_Update(t *testing.T) {
 				return
 			}
 
+			sortScene(&copy)
+			sortScene(s)
 			assert.Equal(copy, *s)
 		})
 	}
@@ -699,6 +711,8 @@ func Test_sceneQueryBuilder_UpdatePartial(t *testing.T) {
 			// ignore file ids
 			clearSceneFileIDs(got)
 
+			sortScene(&tt.want)
+			sortScene(got)
 			assert.Equal(tt.want, *got)
 
 			s, err := qb.Find(ctx, tt.id)
@@ -714,6 +728,7 @@ func Test_sceneQueryBuilder_UpdatePartial(t *testing.T) {
 			// ignore file ids
 			clearSceneFileIDs(s)
 
+			sortScene(s)
 			assert.Equal(tt.want, *s)
 		})
 	}