Remove old FieldSeeker tables, use v2 generated tables.

This requires a bunch of changes since the types on these tables are
much closer to the underlying types of the Fieldseeker data we are
getting back from the API.

I now need to use proper UUID types everywhere, which means I had to
modify the bob gen config to consistently use google UUID, my UUID
library of choice.

I also had to add the organization_id to all the fieldseeker tables
since we rely on them existing for some of our compound queries.

There were some changes to the API type signatures to get things to
build. I may yet regret those.
This commit is contained in:
Eli Ribble 2025-12-24 17:49:39 -07:00
parent 58f5afccc9
commit 1395e3d3ac
445 changed files with 54077 additions and 275856 deletions

View file

@ -1,17 +1,19 @@
// Code generated by BobGen psql v0.0.3-0.20251202003046-49148fc66a73+dirty. DO NOT EDIT.
// Code generated by BobGen psql v0.0.4-0.20251216163753-8e325b7c773a+dirty. DO NOT EDIT.
// This file is meant to be re-generated in place and/or deleted at any time.
package models
import (
"context"
"encoding/json"
"fmt"
"io"
"time"
"github.com/aarondl/opt/null"
"github.com/aarondl/opt/omit"
"github.com/aarondl/opt/omitnull"
"github.com/gofrs/uuid/v5"
"github.com/google/uuid"
"github.com/stephenafamo/bob"
"github.com/stephenafamo/bob/dialect/psql"
"github.com/stephenafamo/bob/dialect/psql/dialect"
@ -19,26 +21,45 @@ import (
"github.com/stephenafamo/bob/dialect/psql/sm"
"github.com/stephenafamo/bob/dialect/psql/um"
"github.com/stephenafamo/bob/expr"
"github.com/stephenafamo/bob/mods"
"github.com/stephenafamo/bob/orm"
"github.com/stephenafamo/bob/types"
"github.com/stephenafamo/bob/types/pgtypes"
)
// FieldseekerZones2 is an object representing the database table.
type FieldseekerZones2 struct {
Objectid int64 `db:"objectid,pk" `
// Name
Name null.Val[string] `db:"name" `
Globalid null.Val[uuid.UUID] `db:"globalid" `
CreatedUser null.Val[string] `db:"created_user" `
CreatedDate null.Val[time.Time] `db:"created_date" `
LastEditedUser null.Val[string] `db:"last_edited_user" `
// Original attribute from ArcGIS API is NAME
Name null.Val[string] `db:"name" `
// Original attribute from ArcGIS API is GlobalID
Globalid null.Val[uuid.UUID] `db:"globalid" `
// Original attribute from ArcGIS API is created_user
CreatedUser null.Val[string] `db:"created_user" `
// Original attribute from ArcGIS API is created_date
CreatedDate null.Val[time.Time] `db:"created_date" `
// Original attribute from ArcGIS API is last_edited_user
LastEditedUser null.Val[string] `db:"last_edited_user" `
// Original attribute from ArcGIS API is last_edited_date
LastEditedDate null.Val[time.Time] `db:"last_edited_date" `
Creationdate null.Val[time.Time] `db:"creationdate" `
Creator null.Val[string] `db:"creator" `
Editdate null.Val[time.Time] `db:"editdate" `
Editor null.Val[string] `db:"editor" `
ShapeArea null.Val[float64] `db:"shape__area" `
ShapeLength null.Val[float64] `db:"shape__length" `
// Tracks version changes to the row. Increases when data is modified.
Version int32 `db:"version,pk" `
// Original attribute from ArcGIS API is CreationDate
Creationdate null.Val[time.Time] `db:"creationdate" `
// Original attribute from ArcGIS API is Creator
Creator null.Val[string] `db:"creator" `
// Original attribute from ArcGIS API is EditDate
Editdate null.Val[time.Time] `db:"editdate" `
// Original attribute from ArcGIS API is Editor
Editor null.Val[string] `db:"editor" `
// Original attribute from ArcGIS API is Shape__Area
ShapeArea null.Val[float64] `db:"shape__area" `
// Original attribute from ArcGIS API is Shape__Length
ShapeLength null.Val[float64] `db:"shape__length" `
Geometry types.JSON[json.RawMessage] `db:"geometry" `
Geospatial null.Val[string] `db:"geospatial" `
Version int32 `db:"version,pk" `
OrganizationID int32 `db:"organization_id" `
R fieldseekerZones2R `db:"-" `
}
// FieldseekerZones2Slice is an alias for a slice of pointers to FieldseekerZones2.
@ -51,10 +72,15 @@ var FieldseekerZones2s = psql.NewTablex[*FieldseekerZones2, FieldseekerZones2Sli
// FieldseekerZones2sQuery is a query on the zones2 table
type FieldseekerZones2sQuery = *psql.ViewQuery[*FieldseekerZones2, FieldseekerZones2Slice]
// fieldseekerZones2R is where relationships are stored.
type fieldseekerZones2R struct {
Organization *Organization // fieldseeker.zones2.zones2_organization_id_fkey
}
func buildFieldseekerZones2Columns(alias string) fieldseekerZones2Columns {
return fieldseekerZones2Columns{
ColumnsExpr: expr.NewColumnsExpr(
"objectid", "name", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "creationdate", "creator", "editdate", "editor", "shape__area", "shape__length", "version",
"objectid", "name", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "creationdate", "creator", "editdate", "editor", "shape__area", "shape__length", "geometry", "geospatial", "version", "organization_id",
).WithParent("fieldseeker.zones2"),
tableAlias: alias,
Objectid: psql.Quote(alias, "objectid"),
@ -70,7 +96,10 @@ func buildFieldseekerZones2Columns(alias string) fieldseekerZones2Columns {
Editor: psql.Quote(alias, "editor"),
ShapeArea: psql.Quote(alias, "shape__area"),
ShapeLength: psql.Quote(alias, "shape__length"),
Geometry: psql.Quote(alias, "geometry"),
Geospatial: psql.Quote(alias, "geospatial"),
Version: psql.Quote(alias, "version"),
OrganizationID: psql.Quote(alias, "organization_id"),
}
}
@ -90,7 +119,10 @@ type fieldseekerZones2Columns struct {
Editor psql.Expression
ShapeArea psql.Expression
ShapeLength psql.Expression
Geometry psql.Expression
Geospatial psql.Expression
Version psql.Expression
OrganizationID psql.Expression
}
func (c fieldseekerZones2Columns) Alias() string {
@ -105,24 +137,27 @@ func (fieldseekerZones2Columns) AliasedAs(alias string) fieldseekerZones2Columns
// All values are optional, and do not have to be set
// Generated columns are not included
type FieldseekerZones2Setter struct {
Objectid omit.Val[int64] `db:"objectid,pk" `
Name omitnull.Val[string] `db:"name" `
Globalid omitnull.Val[uuid.UUID] `db:"globalid" `
CreatedUser omitnull.Val[string] `db:"created_user" `
CreatedDate omitnull.Val[time.Time] `db:"created_date" `
LastEditedUser omitnull.Val[string] `db:"last_edited_user" `
LastEditedDate omitnull.Val[time.Time] `db:"last_edited_date" `
Creationdate omitnull.Val[time.Time] `db:"creationdate" `
Creator omitnull.Val[string] `db:"creator" `
Editdate omitnull.Val[time.Time] `db:"editdate" `
Editor omitnull.Val[string] `db:"editor" `
ShapeArea omitnull.Val[float64] `db:"shape__area" `
ShapeLength omitnull.Val[float64] `db:"shape__length" `
Version omit.Val[int32] `db:"version,pk" `
Objectid omit.Val[int64] `db:"objectid,pk" `
Name omitnull.Val[string] `db:"name" `
Globalid omitnull.Val[uuid.UUID] `db:"globalid" `
CreatedUser omitnull.Val[string] `db:"created_user" `
CreatedDate omitnull.Val[time.Time] `db:"created_date" `
LastEditedUser omitnull.Val[string] `db:"last_edited_user" `
LastEditedDate omitnull.Val[time.Time] `db:"last_edited_date" `
Creationdate omitnull.Val[time.Time] `db:"creationdate" `
Creator omitnull.Val[string] `db:"creator" `
Editdate omitnull.Val[time.Time] `db:"editdate" `
Editor omitnull.Val[string] `db:"editor" `
ShapeArea omitnull.Val[float64] `db:"shape__area" `
ShapeLength omitnull.Val[float64] `db:"shape__length" `
Geometry omit.Val[types.JSON[json.RawMessage]] `db:"geometry" `
Geospatial omitnull.Val[string] `db:"geospatial" `
Version omit.Val[int32] `db:"version,pk" `
OrganizationID omit.Val[int32] `db:"organization_id" `
}
func (s FieldseekerZones2Setter) SetColumns() []string {
vals := make([]string, 0, 14)
vals := make([]string, 0, 17)
if s.Objectid.IsValue() {
vals = append(vals, "objectid")
}
@ -162,9 +197,18 @@ func (s FieldseekerZones2Setter) SetColumns() []string {
if !s.ShapeLength.IsUnset() {
vals = append(vals, "shape__length")
}
if s.Geometry.IsValue() {
vals = append(vals, "geometry")
}
if !s.Geospatial.IsUnset() {
vals = append(vals, "geospatial")
}
if s.Version.IsValue() {
vals = append(vals, "version")
}
if s.OrganizationID.IsValue() {
vals = append(vals, "organization_id")
}
return vals
}
@ -208,9 +252,18 @@ func (s FieldseekerZones2Setter) Overwrite(t *FieldseekerZones2) {
if !s.ShapeLength.IsUnset() {
t.ShapeLength = s.ShapeLength.MustGetNull()
}
if s.Geometry.IsValue() {
t.Geometry = s.Geometry.MustGet()
}
if !s.Geospatial.IsUnset() {
t.Geospatial = s.Geospatial.MustGetNull()
}
if s.Version.IsValue() {
t.Version = s.Version.MustGet()
}
if s.OrganizationID.IsValue() {
t.OrganizationID = s.OrganizationID.MustGet()
}
}
func (s *FieldseekerZones2Setter) Apply(q *dialect.InsertQuery) {
@ -219,7 +272,7 @@ func (s *FieldseekerZones2Setter) Apply(q *dialect.InsertQuery) {
})
q.AppendValues(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
vals := make([]bob.Expression, 14)
vals := make([]bob.Expression, 17)
if s.Objectid.IsValue() {
vals[0] = psql.Arg(s.Objectid.MustGet())
} else {
@ -298,12 +351,30 @@ func (s *FieldseekerZones2Setter) Apply(q *dialect.InsertQuery) {
vals[12] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[13] = psql.Arg(s.Version.MustGet())
if s.Geometry.IsValue() {
vals[13] = psql.Arg(s.Geometry.MustGet())
} else {
vals[13] = psql.Raw("DEFAULT")
}
if !s.Geospatial.IsUnset() {
vals[14] = psql.Arg(s.Geospatial.MustGetNull())
} else {
vals[14] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[15] = psql.Arg(s.Version.MustGet())
} else {
vals[15] = psql.Raw("DEFAULT")
}
if s.OrganizationID.IsValue() {
vals[16] = psql.Arg(s.OrganizationID.MustGet())
} else {
vals[16] = psql.Raw("DEFAULT")
}
return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "")
}))
}
@ -313,7 +384,7 @@ func (s FieldseekerZones2Setter) UpdateMod() bob.Mod[*dialect.UpdateQuery] {
}
func (s FieldseekerZones2Setter) Expressions(prefix ...string) []bob.Expression {
exprs := make([]bob.Expression, 0, 14)
exprs := make([]bob.Expression, 0, 17)
if s.Objectid.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
@ -406,6 +477,20 @@ func (s FieldseekerZones2Setter) Expressions(prefix ...string) []bob.Expression
}})
}
if s.Geometry.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "geometry")...),
psql.Arg(s.Geometry),
}})
}
if !s.Geospatial.IsUnset() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "geospatial")...),
psql.Arg(s.Geospatial),
}})
}
if s.Version.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "version")...),
@ -413,6 +498,13 @@ func (s FieldseekerZones2Setter) Expressions(prefix ...string) []bob.Expression
}})
}
if s.OrganizationID.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "organization_id")...),
psql.Arg(s.OrganizationID),
}})
}
return exprs
}
@ -480,6 +572,7 @@ func (o *FieldseekerZones2) Update(ctx context.Context, exec bob.Executor, s *Fi
return err
}
o.R = v.R
*o = *v
return nil
@ -500,7 +593,7 @@ func (o *FieldseekerZones2) Reload(ctx context.Context, exec bob.Executor) error
if err != nil {
return err
}
o2.R = o.R
*o = *o2
return nil
@ -550,7 +643,7 @@ func (o FieldseekerZones2Slice) copyMatchingRows(from ...*FieldseekerZones2) {
if new.Version != old.Version {
continue
}
new.R = old.R
o[i] = new
break
}
@ -648,6 +741,78 @@ func (o FieldseekerZones2Slice) ReloadAll(ctx context.Context, exec bob.Executor
return nil
}
// Organization starts a query for related objects on organization
func (o *FieldseekerZones2) Organization(mods ...bob.Mod[*dialect.SelectQuery]) OrganizationsQuery {
return Organizations.Query(append(mods,
sm.Where(Organizations.Columns.ID.EQ(psql.Arg(o.OrganizationID))),
)...)
}
func (os FieldseekerZones2Slice) Organization(mods ...bob.Mod[*dialect.SelectQuery]) OrganizationsQuery {
pkOrganizationID := make(pgtypes.Array[int32], 0, len(os))
for _, o := range os {
if o == nil {
continue
}
pkOrganizationID = append(pkOrganizationID, o.OrganizationID)
}
PKArgExpr := psql.Select(sm.Columns(
psql.F("unnest", psql.Cast(psql.Arg(pkOrganizationID), "integer[]")),
))
return Organizations.Query(append(mods,
sm.Where(psql.Group(Organizations.Columns.ID).OP("IN", PKArgExpr)),
)...)
}
func attachFieldseekerZones2Organization0(ctx context.Context, exec bob.Executor, count int, fieldseekerZones20 *FieldseekerZones2, organization1 *Organization) (*FieldseekerZones2, error) {
setter := &FieldseekerZones2Setter{
OrganizationID: omit.From(organization1.ID),
}
err := fieldseekerZones20.Update(ctx, exec, setter)
if err != nil {
return nil, fmt.Errorf("attachFieldseekerZones2Organization0: %w", err)
}
return fieldseekerZones20, nil
}
func (fieldseekerZones20 *FieldseekerZones2) InsertOrganization(ctx context.Context, exec bob.Executor, related *OrganizationSetter) error {
var err error
organization1, err := Organizations.Insert(related).One(ctx, exec)
if err != nil {
return fmt.Errorf("inserting related objects: %w", err)
}
_, err = attachFieldseekerZones2Organization0(ctx, exec, 1, fieldseekerZones20, organization1)
if err != nil {
return err
}
fieldseekerZones20.R.Organization = organization1
organization1.R.Zones2s = append(organization1.R.Zones2s, fieldseekerZones20)
return nil
}
func (fieldseekerZones20 *FieldseekerZones2) AttachOrganization(ctx context.Context, exec bob.Executor, organization1 *Organization) error {
var err error
_, err = attachFieldseekerZones2Organization0(ctx, exec, 1, fieldseekerZones20, organization1)
if err != nil {
return err
}
fieldseekerZones20.R.Organization = organization1
organization1.R.Zones2s = append(organization1.R.Zones2s, fieldseekerZones20)
return nil
}
type fieldseekerZones2Where[Q psql.Filterable] struct {
Objectid psql.WhereMod[Q, int64]
Name psql.WhereNullMod[Q, string]
@ -662,7 +827,10 @@ type fieldseekerZones2Where[Q psql.Filterable] struct {
Editor psql.WhereNullMod[Q, string]
ShapeArea psql.WhereNullMod[Q, float64]
ShapeLength psql.WhereNullMod[Q, float64]
Geometry psql.WhereMod[Q, types.JSON[json.RawMessage]]
Geospatial psql.WhereNullMod[Q, string]
Version psql.WhereMod[Q, int32]
OrganizationID psql.WhereMod[Q, int32]
}
func (fieldseekerZones2Where[Q]) AliasedAs(alias string) fieldseekerZones2Where[Q] {
@ -684,6 +852,154 @@ func buildFieldseekerZones2Where[Q psql.Filterable](cols fieldseekerZones2Column
Editor: psql.WhereNull[Q, string](cols.Editor),
ShapeArea: psql.WhereNull[Q, float64](cols.ShapeArea),
ShapeLength: psql.WhereNull[Q, float64](cols.ShapeLength),
Geometry: psql.Where[Q, types.JSON[json.RawMessage]](cols.Geometry),
Geospatial: psql.WhereNull[Q, string](cols.Geospatial),
Version: psql.Where[Q, int32](cols.Version),
OrganizationID: psql.Where[Q, int32](cols.OrganizationID),
}
}
func (o *FieldseekerZones2) Preload(name string, retrieved any) error {
if o == nil {
return nil
}
switch name {
case "Organization":
rel, ok := retrieved.(*Organization)
if !ok {
return fmt.Errorf("fieldseekerZones2 cannot load %T as %q", retrieved, name)
}
o.R.Organization = rel
if rel != nil {
rel.R.Zones2s = FieldseekerZones2Slice{o}
}
return nil
default:
return fmt.Errorf("fieldseekerZones2 has no relationship %q", name)
}
}
type fieldseekerZones2Preloader struct {
Organization func(...psql.PreloadOption) psql.Preloader
}
func buildFieldseekerZones2Preloader() fieldseekerZones2Preloader {
return fieldseekerZones2Preloader{
Organization: func(opts ...psql.PreloadOption) psql.Preloader {
return psql.Preload[*Organization, OrganizationSlice](psql.PreloadRel{
Name: "Organization",
Sides: []psql.PreloadSide{
{
From: FieldseekerZones2s,
To: Organizations,
FromColumns: []string{"organization_id"},
ToColumns: []string{"id"},
},
},
}, Organizations.Columns.Names(), opts...)
},
}
}
type fieldseekerZones2ThenLoader[Q orm.Loadable] struct {
Organization func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q]
}
func buildFieldseekerZones2ThenLoader[Q orm.Loadable]() fieldseekerZones2ThenLoader[Q] {
type OrganizationLoadInterface interface {
LoadOrganization(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error
}
return fieldseekerZones2ThenLoader[Q]{
Organization: thenLoadBuilder[Q](
"Organization",
func(ctx context.Context, exec bob.Executor, retrieved OrganizationLoadInterface, mods ...bob.Mod[*dialect.SelectQuery]) error {
return retrieved.LoadOrganization(ctx, exec, mods...)
},
),
}
}
// LoadOrganization loads the fieldseekerZones2's Organization into the .R struct
func (o *FieldseekerZones2) LoadOrganization(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error {
if o == nil {
return nil
}
// Reset the relationship
o.R.Organization = nil
related, err := o.Organization(mods...).One(ctx, exec)
if err != nil {
return err
}
related.R.Zones2s = FieldseekerZones2Slice{o}
o.R.Organization = related
return nil
}
// LoadOrganization loads the fieldseekerZones2's Organization into the .R struct
func (os FieldseekerZones2Slice) LoadOrganization(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error {
if len(os) == 0 {
return nil
}
organizations, err := os.Organization(mods...).All(ctx, exec)
if err != nil {
return err
}
for _, o := range os {
if o == nil {
continue
}
for _, rel := range organizations {
if !(o.OrganizationID == rel.ID) {
continue
}
rel.R.Zones2s = append(rel.R.Zones2s, o)
o.R.Organization = rel
break
}
}
return nil
}
type fieldseekerZones2Joins[Q dialect.Joinable] struct {
typ string
Organization modAs[Q, organizationColumns]
}
func (j fieldseekerZones2Joins[Q]) aliasedAs(alias string) fieldseekerZones2Joins[Q] {
return buildFieldseekerZones2Joins[Q](buildFieldseekerZones2Columns(alias), j.typ)
}
func buildFieldseekerZones2Joins[Q dialect.Joinable](cols fieldseekerZones2Columns, typ string) fieldseekerZones2Joins[Q] {
return fieldseekerZones2Joins[Q]{
typ: typ,
Organization: modAs[Q, organizationColumns]{
c: Organizations.Columns,
f: func(to organizationColumns) bob.Mod[Q] {
mods := make(mods.QueryMods[Q], 0, 1)
{
mods = append(mods, dialect.Join[Q](typ, Organizations.Name().As(to.Alias())).On(
to.ID.EQ(cols.OrganizationID),
))
}
return mods
},
},
}
}