From b0170b20d5b455404138fd5a1254c2d6567e8d3b Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Wed, 22 Apr 2026 22:20:42 +0000 Subject: [PATCH] Update fetching address number to match new types.Address pattern This matches what we get by using the models column definition directly. --- platform/publicreport/report.go | 2 +- platform/signal.go | 2 +- platform/site.go | 2 +- platform/types/address.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/publicreport/report.go b/platform/publicreport/report.go index 87207403..9598768c 100644 --- a/platform/publicreport/report.go +++ b/platform/publicreport/report.go @@ -142,7 +142,7 @@ func reportQuery() bob.BaseQuery[*dialect.SelectQuery] { "COALESCE(a.location_latitude, 0) AS \"address.location.latitude\"", "COALESCE(a.location_longitude, 0) AS \"address.location.longitude\"", "COALESCE(a.locality, '') AS \"address.locality\"", - "COALESCE(a.number_, '') AS \"address.number\"", + "COALESCE(a.number_, '') AS \"address.number_\"", "COALESCE(a.postal_code, '') AS \"address.postal_code\"", "COALESCE(a.region, '') AS \"address.region\"", "COALESCE(a.street, '') AS \"address.street\"", diff --git a/platform/signal.go b/platform/signal.go index 1df0ed0b..ef516105 100644 --- a/platform/signal.go +++ b/platform/signal.go @@ -236,7 +236,7 @@ func SignalList(ctx context.Context, user User, limit int) ([]*Signal, error) { "signal.type_ AS type", "COALESCE(address.country, 'usa') AS \"address.country\"", "COALESCE(address.locality, '') AS \"address.locality\"", - "COALESCE(address.number_, '') AS \"address.number\"", + "COALESCE(address.number_, '') AS \"address.number_\"", "COALESCE(address.postal_code, '') AS \"address.postal_code\"", "COALESCE(address.region, '') AS \"address.region\"", "COALESCE(address.street, '') AS \"address.street\"", diff --git a/platform/site.go b/platform/site.go index 42350e6a..7e122046 100644 --- a/platform/site.go +++ b/platform/site.go @@ -146,7 +146,7 @@ func siteQuery() bob.BaseQuery[*dialect.SelectQuery] { "address.locality AS \"address.locality\"", "COALESCE(address.location_latitude, 0) AS \"address.location.latitude\"", "COALESCE(address.location_longitude, 0) AS \"address.location.longitude\"", - "address.number_ AS \"address.number\"", + "address.number_ AS \"address.number_\"", "address.postal_code AS \"address.postal_code\"", "address.region AS \"address.region\"", "address.street AS \"address.street\"", diff --git a/platform/types/address.go b/platform/types/address.go index d6355c42..a0d8398d 100644 --- a/platform/types/address.go +++ b/platform/types/address.go @@ -20,7 +20,7 @@ type Address struct { ID *int32 `db:"id" json:"-" schema:"-"` Locality string `db:"locality" json:"locality"` Location *Location `db:"location" json:"location" schema:"location"` - Number string `db:"number" json:"number"` + Number string `db:"number_" json:"number"` PostalCode string `db:"postal_code" json:"postal_code"` Raw string `db:"raw" json:"raw" schema:"raw"` Region string `db:"region" json:"region"`