diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go index 29e39270d..0ea3d7170 100644 --- a/pkg/sqlite/database.go +++ b/pkg/sqlite/database.go @@ -34,7 +34,7 @@ const ( cacheSizeEnv = "STASH_SQLITE_CACHE_SIZE" ) -var appSchemaVersion uint = 74 +var appSchemaVersion uint = 75 //go:embed migrations/*.sql var migrationsBox embed.FS diff --git a/pkg/sqlite/date.go b/pkg/sqlite/date.go index ec41b612c..522fe7cb0 100644 --- a/pkg/sqlite/date.go +++ b/pkg/sqlite/date.go @@ -5,6 +5,7 @@ import ( "time" "github.com/stashapp/stash/pkg/models" + "gopkg.in/guregu/null.v4" ) const sqliteDateLayout = "2006-01-02" @@ -54,12 +55,12 @@ func (d NullDate) Value() (driver.Value, error) { return d.Date.Format(sqliteDateLayout), nil } -func (d *NullDate) DatePtr() *models.Date { +func (d *NullDate) DatePtr(precision null.Int) *models.Date { if d == nil || !d.Valid { return nil } - return &models.Date{Time: d.Date} + return &models.Date{Time: d.Date, Precision: models.DatePrecision(precision.Int64)} } func NullDateFromDatePtr(d *models.Date) NullDate { @@ -68,3 +69,11 @@ func NullDateFromDatePtr(d *models.Date) NullDate { } return NullDate{Date: d.Time, Valid: true} } + +func datePrecisionFromDatePtr(d *models.Date) null.Int { + if d == nil { + // default to day precision + return null.Int{} + } + return null.IntFrom(int64(d.Precision)) +} diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go index 9cfe38b1f..a791fc1ec 100644 --- a/pkg/sqlite/gallery.go +++ b/pkg/sqlite/gallery.go @@ -30,12 +30,13 @@ const ( ) type galleryRow struct { - ID int `db:"id" goqu:"skipinsert"` - Title zero.String `db:"title"` - Code zero.String `db:"code"` - Date NullDate `db:"date"` - Details zero.String `db:"details"` - Photographer zero.String `db:"photographer"` + ID int `db:"id" goqu:"skipinsert"` + Title zero.String `db:"title"` + Code zero.String `db:"code"` + Date NullDate `db:"date"` + DatePrecision null.Int `db:"date_precision"` + Details zero.String `db:"details"` + Photographer zero.String `db:"photographer"` // expressed as 1-100 Rating null.Int `db:"rating"` Organized bool `db:"organized"` @@ -50,6 +51,7 @@ func (r *galleryRow) fromGallery(o models.Gallery) { r.Title = zero.StringFrom(o.Title) r.Code = zero.StringFrom(o.Code) r.Date = NullDateFromDatePtr(o.Date) + r.DatePrecision = datePrecisionFromDatePtr(o.Date) r.Details = zero.StringFrom(o.Details) r.Photographer = zero.StringFrom(o.Photographer) r.Rating = intFromPtr(o.Rating) @@ -74,7 +76,7 @@ func (r *galleryQueryRow) resolve() *models.Gallery { ID: r.ID, Title: r.Title.String, Code: r.Code.String, - Date: r.Date.DatePtr(), + Date: r.Date.DatePtr(r.DatePrecision), Details: r.Details.String, Photographer: r.Photographer.String, Rating: nullIntPtr(r.Rating), @@ -102,7 +104,7 @@ type galleryRowRecord struct { func (r *galleryRowRecord) fromPartial(o models.GalleryPartial) { r.setNullString("title", o.Title) r.setNullString("code", o.Code) - r.setNullDate("date", o.Date) + r.setNullDate("date", "date_precision", o.Date) r.setNullString("details", o.Details) r.setNullString("photographer", o.Photographer) r.setNullInt("rating", o.Rating) diff --git a/pkg/sqlite/group.go b/pkg/sqlite/group.go index f0f8d6b40..99d356f6c 100644 --- a/pkg/sqlite/group.go +++ b/pkg/sqlite/group.go @@ -32,11 +32,12 @@ const ( ) type groupRow struct { - ID int `db:"id" goqu:"skipinsert"` - Name zero.String `db:"name"` - Aliases zero.String `db:"aliases"` - Duration null.Int `db:"duration"` - Date NullDate `db:"date"` + ID int `db:"id" goqu:"skipinsert"` + Name zero.String `db:"name"` + Aliases zero.String `db:"aliases"` + Duration null.Int `db:"duration"` + Date NullDate `db:"date"` + DatePrecision null.Int `db:"date_precision"` // expressed as 1-100 Rating null.Int `db:"rating"` StudioID null.Int `db:"studio_id,omitempty"` @@ -56,6 +57,7 @@ func (r *groupRow) fromGroup(o models.Group) { r.Aliases = zero.StringFrom(o.Aliases) r.Duration = intFromPtr(o.Duration) r.Date = NullDateFromDatePtr(o.Date) + r.DatePrecision = datePrecisionFromDatePtr(o.Date) r.Rating = intFromPtr(o.Rating) r.StudioID = intFromPtr(o.StudioID) r.Director = zero.StringFrom(o.Director) @@ -70,7 +72,7 @@ func (r *groupRow) resolve() *models.Group { Name: r.Name.String, Aliases: r.Aliases.String, Duration: nullIntPtr(r.Duration), - Date: r.Date.DatePtr(), + Date: r.Date.DatePtr(r.DatePrecision), Rating: nullIntPtr(r.Rating), StudioID: nullIntPtr(r.StudioID), Director: r.Director.String, @@ -90,7 +92,7 @@ func (r *groupRowRecord) fromPartial(o models.GroupPartial) { r.setNullString("name", o.Name) r.setNullString("aliases", o.Aliases) r.setNullInt("duration", o.Duration) - r.setNullDate("date", o.Date) + r.setNullDate("date", "date_precision", o.Date) r.setNullInt("rating", o.Rating) r.setNullInt("studio_id", o.StudioID) r.setNullString("director", o.Director) diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go index 1588fa415..6973b2916 100644 --- a/pkg/sqlite/image.go +++ b/pkg/sqlite/image.go @@ -34,15 +34,16 @@ type imageRow struct { Title zero.String `db:"title"` Code zero.String `db:"code"` // expressed as 1-100 - Rating null.Int `db:"rating"` - Date NullDate `db:"date"` - Details zero.String `db:"details"` - Photographer zero.String `db:"photographer"` - Organized bool `db:"organized"` - OCounter int `db:"o_counter"` - StudioID null.Int `db:"studio_id,omitempty"` - CreatedAt Timestamp `db:"created_at"` - UpdatedAt Timestamp `db:"updated_at"` + Rating null.Int `db:"rating"` + Date NullDate `db:"date"` + DatePrecision null.Int `db:"date_precision"` + Details zero.String `db:"details"` + Photographer zero.String `db:"photographer"` + Organized bool `db:"organized"` + OCounter int `db:"o_counter"` + StudioID null.Int `db:"studio_id,omitempty"` + CreatedAt Timestamp `db:"created_at"` + UpdatedAt Timestamp `db:"updated_at"` } func (r *imageRow) fromImage(i models.Image) { @@ -51,6 +52,7 @@ func (r *imageRow) fromImage(i models.Image) { r.Code = zero.StringFrom(i.Code) r.Rating = intFromPtr(i.Rating) r.Date = NullDateFromDatePtr(i.Date) + r.DatePrecision = datePrecisionFromDatePtr(i.Date) r.Details = zero.StringFrom(i.Details) r.Photographer = zero.StringFrom(i.Photographer) r.Organized = i.Organized @@ -74,7 +76,7 @@ func (r *imageQueryRow) resolve() *models.Image { Title: r.Title.String, Code: r.Code.String, Rating: nullIntPtr(r.Rating), - Date: r.Date.DatePtr(), + Date: r.Date.DatePtr(r.DatePrecision), Details: r.Details.String, Photographer: r.Photographer.String, Organized: r.Organized, @@ -103,7 +105,7 @@ func (r *imageRowRecord) fromPartial(i models.ImagePartial) { r.setNullString("title", i.Title) r.setNullString("code", i.Code) r.setNullInt("rating", i.Rating) - r.setNullDate("date", i.Date) + r.setNullDate("date", "date_precision", i.Date) r.setNullString("details", i.Details) r.setNullString("photographer", i.Photographer) r.setBool("organized", i.Organized) diff --git a/pkg/sqlite/migrations/75_date_precision.up.sql b/pkg/sqlite/migrations/75_date_precision.up.sql new file mode 100644 index 000000000..ce35bf170 --- /dev/null +++ b/pkg/sqlite/migrations/75_date_precision.up.sql @@ -0,0 +1,13 @@ +ALTER TABLE "scenes" ADD COLUMN "date_precision" TINYINT; +ALTER TABLE "images" ADD COLUMN "date_precision" TINYINT; +ALTER TABLE "galleries" ADD COLUMN "date_precision" TINYINT; +ALTER TABLE "groups" ADD COLUMN "date_precision" TINYINT; +ALTER TABLE "performers" ADD COLUMN "birthdate_precision" TINYINT; +ALTER TABLE "performers" ADD COLUMN "death_date_precision" TINYINT; + +UPDATE "scenes" SET "date_precision" = 0 WHERE "date" IS NOT NULL; +UPDATE "images" SET "date_precision" = 0 WHERE "date" IS NOT NULL; +UPDATE "galleries" SET "date_precision" = 0 WHERE "date" IS NOT NULL; +UPDATE "groups" SET "date_precision" = 0 WHERE "date" IS NOT NULL; +UPDATE "performers" SET "birthdate_precision" = 0 WHERE "birthdate" IS NOT NULL; +UPDATE "performers" SET "death_date_precision" = 0 WHERE "death_date" IS NOT NULL; diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go index c5943b182..bf6b780b2 100644 --- a/pkg/sqlite/performer.go +++ b/pkg/sqlite/performer.go @@ -30,32 +30,34 @@ const ( ) type performerRow struct { - ID int `db:"id" goqu:"skipinsert"` - Name null.String `db:"name"` // TODO: make schema non-nullable - Disambigation zero.String `db:"disambiguation"` - Gender zero.String `db:"gender"` - Birthdate NullDate `db:"birthdate"` - Ethnicity zero.String `db:"ethnicity"` - Country zero.String `db:"country"` - EyeColor zero.String `db:"eye_color"` - Height null.Int `db:"height"` - Measurements zero.String `db:"measurements"` - FakeTits zero.String `db:"fake_tits"` - PenisLength null.Float `db:"penis_length"` - Circumcised zero.String `db:"circumcised"` - CareerLength zero.String `db:"career_length"` - Tattoos zero.String `db:"tattoos"` - Piercings zero.String `db:"piercings"` - Favorite bool `db:"favorite"` - CreatedAt Timestamp `db:"created_at"` - UpdatedAt Timestamp `db:"updated_at"` + ID int `db:"id" goqu:"skipinsert"` + Name null.String `db:"name"` // TODO: make schema non-nullable + Disambigation zero.String `db:"disambiguation"` + Gender zero.String `db:"gender"` + Birthdate NullDate `db:"birthdate"` + BirthdatePrecision null.Int `db:"birthdate_precision"` + Ethnicity zero.String `db:"ethnicity"` + Country zero.String `db:"country"` + EyeColor zero.String `db:"eye_color"` + Height null.Int `db:"height"` + Measurements zero.String `db:"measurements"` + FakeTits zero.String `db:"fake_tits"` + PenisLength null.Float `db:"penis_length"` + Circumcised zero.String `db:"circumcised"` + CareerLength zero.String `db:"career_length"` + Tattoos zero.String `db:"tattoos"` + Piercings zero.String `db:"piercings"` + Favorite bool `db:"favorite"` + CreatedAt Timestamp `db:"created_at"` + UpdatedAt Timestamp `db:"updated_at"` // expressed as 1-100 - Rating null.Int `db:"rating"` - Details zero.String `db:"details"` - DeathDate NullDate `db:"death_date"` - HairColor zero.String `db:"hair_color"` - Weight null.Int `db:"weight"` - IgnoreAutoTag bool `db:"ignore_auto_tag"` + Rating null.Int `db:"rating"` + Details zero.String `db:"details"` + DeathDate NullDate `db:"death_date"` + DeathDatePrecision null.Int `db:"death_date_precision"` + HairColor zero.String `db:"hair_color"` + Weight null.Int `db:"weight"` + IgnoreAutoTag bool `db:"ignore_auto_tag"` // not used in resolution or updates ImageBlob zero.String `db:"image_blob"` @@ -69,6 +71,7 @@ func (r *performerRow) fromPerformer(o models.Performer) { r.Gender = zero.StringFrom(o.Gender.String()) } r.Birthdate = NullDateFromDatePtr(o.Birthdate) + r.BirthdatePrecision = datePrecisionFromDatePtr(o.Birthdate) r.Ethnicity = zero.StringFrom(o.Ethnicity) r.Country = zero.StringFrom(o.Country) r.EyeColor = zero.StringFrom(o.EyeColor) @@ -88,6 +91,7 @@ func (r *performerRow) fromPerformer(o models.Performer) { r.Rating = intFromPtr(o.Rating) r.Details = zero.StringFrom(o.Details) r.DeathDate = NullDateFromDatePtr(o.DeathDate) + r.DeathDatePrecision = datePrecisionFromDatePtr(o.DeathDate) r.HairColor = zero.StringFrom(o.HairColor) r.Weight = intFromPtr(o.Weight) r.IgnoreAutoTag = o.IgnoreAutoTag @@ -98,7 +102,7 @@ func (r *performerRow) resolve() *models.Performer { ID: r.ID, Name: r.Name.String, Disambiguation: r.Disambigation.String, - Birthdate: r.Birthdate.DatePtr(), + Birthdate: r.Birthdate.DatePtr(r.BirthdatePrecision), Ethnicity: r.Ethnicity.String, Country: r.Country.String, EyeColor: r.EyeColor.String, @@ -115,7 +119,7 @@ func (r *performerRow) resolve() *models.Performer { // expressed as 1-100 Rating: nullIntPtr(r.Rating), Details: r.Details.String, - DeathDate: r.DeathDate.DatePtr(), + DeathDate: r.DeathDate.DatePtr(r.DeathDatePrecision), HairColor: r.HairColor.String, Weight: nullIntPtr(r.Weight), IgnoreAutoTag: r.IgnoreAutoTag, @@ -142,7 +146,7 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) { r.setString("name", o.Name) r.setNullString("disambiguation", o.Disambiguation) r.setNullString("gender", o.Gender) - r.setNullDate("birthdate", o.Birthdate) + r.setNullDate("birthdate", "birthdate_precision", o.Birthdate) r.setNullString("ethnicity", o.Ethnicity) r.setNullString("country", o.Country) r.setNullString("eye_color", o.EyeColor) @@ -159,7 +163,7 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) { r.setTimestamp("updated_at", o.UpdatedAt) r.setNullInt("rating", o.Rating) r.setNullString("details", o.Details) - r.setNullDate("death_date", o.DeathDate) + r.setNullDate("death_date", "death_date_precision", o.DeathDate) r.setNullString("hair_color", o.HairColor) r.setNullInt("weight", o.Weight) r.setBool("ignore_auto_tag", o.IgnoreAutoTag) diff --git a/pkg/sqlite/record.go b/pkg/sqlite/record.go index e60cdc4f7..71622dc60 100644 --- a/pkg/sqlite/record.go +++ b/pkg/sqlite/record.go @@ -100,8 +100,9 @@ func (r *updateRecord) setNullTimestamp(destField string, v models.OptionalTime) } } -func (r *updateRecord) setNullDate(destField string, v models.OptionalDate) { +func (r *updateRecord) setNullDate(destField string, precisionField string, v models.OptionalDate) { if v.Set { r.set(destField, NullDateFromDatePtr(v.Ptr())) + r.set(precisionField, datePrecisionFromDatePtr(v.Ptr())) } } diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go index 40feb5847..64d865578 100644 --- a/pkg/sqlite/scene.go +++ b/pkg/sqlite/scene.go @@ -76,12 +76,13 @@ ORDER BY files.size DESC; ` type sceneRow struct { - ID int `db:"id" goqu:"skipinsert"` - Title zero.String `db:"title"` - Code zero.String `db:"code"` - Details zero.String `db:"details"` - Director zero.String `db:"director"` - Date NullDate `db:"date"` + ID int `db:"id" goqu:"skipinsert"` + Title zero.String `db:"title"` + Code zero.String `db:"code"` + Details zero.String `db:"details"` + Director zero.String `db:"director"` + Date NullDate `db:"date"` + DatePrecision null.Int `db:"date_precision"` // expressed as 1-100 Rating null.Int `db:"rating"` Organized bool `db:"organized"` @@ -102,6 +103,7 @@ func (r *sceneRow) fromScene(o models.Scene) { r.Details = zero.StringFrom(o.Details) r.Director = zero.StringFrom(o.Director) r.Date = NullDateFromDatePtr(o.Date) + r.DatePrecision = datePrecisionFromDatePtr(o.Date) r.Rating = intFromPtr(o.Rating) r.Organized = o.Organized r.StudioID = intFromPtr(o.StudioID) @@ -127,7 +129,7 @@ func (r *sceneQueryRow) resolve() *models.Scene { Code: r.Code.String, Details: r.Details.String, Director: r.Director.String, - Date: r.Date.DatePtr(), + Date: r.Date.DatePtr(r.DatePrecision), Rating: nullIntPtr(r.Rating), Organized: r.Organized, StudioID: nullIntPtr(r.StudioID), @@ -159,7 +161,7 @@ func (r *sceneRowRecord) fromPartial(o models.ScenePartial) { r.setNullString("code", o.Code) r.setNullString("details", o.Details) r.setNullString("director", o.Director) - r.setNullDate("date", o.Date) + r.setNullDate("date", "date_precision", o.Date) r.setNullInt("rating", o.Rating) r.setBool("organized", o.Organized) r.setNullInt("studio_id", o.StudioID)