Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make fieldseeker tables key on globalid, version

Browse source 
This is because the objectid is not unique between organizations.
This commit is contained in:
Eli Ribble 2026-01-13 04:16:24 +00:00
parent d02d34cbaa
commit e18ce6a09e
No known key found for this signature in database
110 changed files with 10602 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

28
db/models/fieldseeker.zones.bob.go
View file

@ -29,11 +29,11 @@ import (
// FieldseekerZone is an object representing the database table.
type FieldseekerZone struct {
Objectid int64 `db:"objectid,pk" `
Objectid int64 `db:"objectid" `
// Original attribute from ArcGIS API is NAME
Name null.Val[string] `db:"name" `
// Original attribute from ArcGIS API is GlobalID
Globalid uuid.UUID `db:"globalid" `
Globalid uuid.UUID `db:"globalid,pk" `
// Original attribute from ArcGIS API is created_user
CreatedUser null.Val[string] `db:"created_user" `
// Original attribute from ArcGIS API is created_date
@ -141,9 +141,9 @@ func (fieldseekerZoneColumns) AliasedAs(alias string) fieldseekerZoneColumns {
// All values are optional, and do not have to be set
// Generated columns are not included
type FieldseekerZoneSetter struct {
Objectid omit.Val[int64] `db:"objectid,pk" `
Objectid omit.Val[int64] `db:"objectid" `
Name omitnull.Val[string] `db:"name" `
Globalid omit.Val[uuid.UUID] `db:"globalid" `
Globalid omit.Val[uuid.UUID] `db:"globalid,pk" `
CreatedUser omitnull.Val[string] `db:"created_user" `
CreatedDate omitnull.Val[time.Time] `db:"created_date" `
LastEditedUser omitnull.Val[string] `db:"last_edited_user" `
@ -534,25 +534,25 @@ func (s FieldseekerZoneSetter) Expressions(prefix ...string) []bob.Expression {
// FindFieldseekerZone retrieves a single record by primary key
// If cols is empty Find will return all columns.
func FindFieldseekerZone(ctx context.Context, exec bob.Executor, ObjectidPK int64, VersionPK int32, cols ...string) (*FieldseekerZone, error) {
func FindFieldseekerZone(ctx context.Context, exec bob.Executor, GlobalidPK uuid.UUID, VersionPK int32, cols ...string) (*FieldseekerZone, error) {
if len(cols) == 0 {
return FieldseekerZones.Query(
sm.Where(FieldseekerZones.Columns.Objectid.EQ(psql.Arg(ObjectidPK))),
sm.Where(FieldseekerZones.Columns.Globalid.EQ(psql.Arg(GlobalidPK))),
sm.Where(FieldseekerZones.Columns.Version.EQ(psql.Arg(VersionPK))),
).One(ctx, exec)
}
return FieldseekerZones.Query(
sm.Where(FieldseekerZones.Columns.Objectid.EQ(psql.Arg(ObjectidPK))),
sm.Where(FieldseekerZones.Columns.Globalid.EQ(psql.Arg(GlobalidPK))),
sm.Where(FieldseekerZones.Columns.Version.EQ(psql.Arg(VersionPK))),
sm.Columns(FieldseekerZones.Columns.Only(cols...)),
).One(ctx, exec)
}
// FieldseekerZoneExists checks the presence of a single record by primary key
func FieldseekerZoneExists(ctx context.Context, exec bob.Executor, ObjectidPK int64, VersionPK int32) (bool, error) {
func FieldseekerZoneExists(ctx context.Context, exec bob.Executor, GlobalidPK uuid.UUID, VersionPK int32) (bool, error) {
return FieldseekerZones.Query(
sm.Where(FieldseekerZones.Columns.Objectid.EQ(psql.Arg(ObjectidPK))),
sm.Where(FieldseekerZones.Columns.Globalid.EQ(psql.Arg(GlobalidPK))),
sm.Where(FieldseekerZones.Columns.Version.EQ(psql.Arg(VersionPK))),
).Exists(ctx, exec)
}
@ -578,13 +578,13 @@ func (o *FieldseekerZone) AfterQueryHook(ctx context.Context, exec bob.Executor,
// primaryKeyVals returns the primary key values of the FieldseekerZone
func (o *FieldseekerZone) primaryKeyVals() bob.Expression {
return psql.ArgGroup(
o.Objectid,
o.Globalid,
o.Version,
)
}
func (o *FieldseekerZone) pkEQ() dialect.Expression {
return psql.Group(psql.Quote("fieldseeker.zones", "objectid"), psql.Quote("fieldseeker.zones", "version")).EQ(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
return psql.Group(psql.Quote("fieldseeker.zones", "globalid"), psql.Quote("fieldseeker.zones", "version")).EQ(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
return o.primaryKeyVals().WriteSQL(ctx, w, d, start)
}))
}
@ -611,7 +611,7 @@ func (o *FieldseekerZone) Delete(ctx context.Context, exec bob.Executor) error {
// Reload refreshes the FieldseekerZone using the executor
func (o *FieldseekerZone) Reload(ctx context.Context, exec bob.Executor) error {
o2, err := FieldseekerZones.Query(
sm.Where(FieldseekerZones.Columns.Objectid.EQ(psql.Arg(o.Objectid))),
sm.Where(FieldseekerZones.Columns.Globalid.EQ(psql.Arg(o.Globalid))),
sm.Where(FieldseekerZones.Columns.Version.EQ(psql.Arg(o.Version))),
).One(ctx, exec)
if err != nil {
@ -646,7 +646,7 @@ func (o FieldseekerZoneSlice) pkIN() dialect.Expression {
return psql.Raw("NULL")
}
return psql.Group(psql.Quote("fieldseeker.zones", "objectid"), psql.Quote("fieldseeker.zones", "version")).In(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
return psql.Group(psql.Quote("fieldseeker.zones", "globalid"), psql.Quote("fieldseeker.zones", "version")).In(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
pkPairs := make([]bob.Expression, len(o))
for i, row := range o {
pkPairs[i] = row.primaryKeyVals()
@ -661,7 +661,7 @@ func (o FieldseekerZoneSlice) pkIN() dialect.Expression {
func (o FieldseekerZoneSlice) copyMatchingRows(from ...*FieldseekerZone) {
for i, old := range o {
for _, new := range from {
if new.Objectid != old.Objectid {
if new.Globalid != old.Globalid {
continue
}
if new.Version != old.Version {