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

Switch to using the Gleipnir fork of jet

Browse source 
Because we need those sweet, sweet geometry columns
This commit is contained in:
Eli Ribble 2026-05-09 01:48:56 +00:00
parent b5bc54b7f4
commit 935800e334
No known key found for this signature in database
31 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db/connection.go
View file

@ -11,7 +11,7 @@ import (
//"github.com/georgysavva/scany/v2/pgxscan"
//"github.com/jackc/pgx/v5"
"github.com/Gleipnir-Technology/bob"
"github.com/go-jet/jet/v2/postgres"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/jackc/pgx/v5/stdlib"

8
db/jet/main.go
View file

@ -5,10 +5,10 @@ import (
"log"
"os"
"github.com/go-jet/jet/v2/generator/metadata"
genpostgres "github.com/go-jet/jet/v2/generator/postgres"
"github.com/go-jet/jet/v2/generator/template"
"github.com/go-jet/jet/v2/postgres"
"github.com/Gleipnir-Technology/jet/generator/metadata"
genpostgres "github.com/Gleipnir-Technology/jet/generator/postgres"
"github.com/Gleipnir-Technology/jet/generator/template"
"github.com/Gleipnir-Technology/jet/postgres"
_ "github.com/lib/pq"
"github.com/twpayne/go-geom"
)

2
db/query/arcgis/account.go
View file

@ -4,10 +4,10 @@ import (
"context"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/table"
"github.com/go-jet/jet/v2/postgres"
)
func AccountFromID(ctx context.Context, org_id string) (model.Account, error) {

2
db/query/arcgis/oauth.go
View file

@ -4,10 +4,10 @@ import (
"context"
"time"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/table"
"github.com/go-jet/jet/v2/postgres"
)
func OAuthTokenInsert(ctx context.Context, m *model.OAuthToken) (model.OAuthToken, error) {

2
db/query/arcgis/service_feature.go
View file

@ -4,10 +4,10 @@ import (
"context"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/table"
"github.com/go-jet/jet/v2/postgres"
)
func ServiceFeatureFromID(ctx context.Context, id string) (model.ServiceFeature, error) {

2
db/query/arcgis/service_map.go
View file

@ -4,10 +4,10 @@ import (
"context"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/table"
"github.com/go-jet/jet/v2/postgres"
)
func ServiceMapFromID(ctx context.Context, id string) (model.ServiceMap, error) {

2
db/query/arcgis/user.go
View file

@ -4,10 +4,10 @@ import (
"context"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/table"
"github.com/go-jet/jet/v2/postgres"
)
func UserFromID(ctx context.Context, id string) (model.User, error) {

2
db/query/arcgis/user_privileges.go
View file

@ -4,10 +4,10 @@ import (
"context"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/arcgis/table"
"github.com/go-jet/jet/v2/postgres"
)
func UserPrivilegesDeleteByUserID(ctx context.Context, txn bob.Tx, id string) error {

2
db/query/public/address.go
View file

@ -8,9 +8,9 @@ import (
//"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/nidus-sync/db"
//"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/enum"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
"github.com/go-jet/jet/v2/postgres"
)
func AddressFromComplianceReportRequestID(ctx context.Context, txn db.Ex, public_id string) (model.Address, error) {

2
db/query/public/communication.go
View file

@ -6,9 +6,9 @@ import (
//"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/nidus-sync/db"
//"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/enum"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
"github.com/go-jet/jet/v2/postgres"
)
func CommunicationInsert(ctx context.Context, txn db.Tx, m model.Communication) (model.Communication, error) {

2
db/query/public/communication_log_entry.go
View file

@ -7,7 +7,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func CommunicationLogEntryInsert(ctx context.Context, txn db.Tx, m model.CommunicationLogEntry) (model.CommunicationLogEntry, error) {

2
db/query/public/compliance_report_request.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func ComplianceReportRequestInsert(ctx context.Context, txn db.Ex, m model.ComplianceReportRequest) (model.ComplianceReportRequest, error) {

2
db/query/public/feature.go
View file

@ -4,10 +4,10 @@ import (
"context"
"fmt"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
"github.com/go-jet/jet/v2/postgres"
)
func FeaturesFromSiteID(ctx context.Context, txn db.Ex, site_id int64) ([]model.Feature, error) {

2
db/query/public/feature_pool.go
View file

@ -4,10 +4,10 @@ import (
"context"
"fmt"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
"github.com/go-jet/jet/v2/postgres"
)
func FeaturePoolsFromFeatures(ctx context.Context, txn db.Ex, feature_ids []int64) ([]model.FeaturePool, error) {

2
db/query/public/job.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func JobInsert(ctx context.Context, txn db.Ex, m model.Job) (model.Job, error) {

2
db/query/public/lead.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func LeadInsert(ctx context.Context, txn db.Ex, m model.Lead) (model.Lead, error) {

2
db/query/public/signal.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func SignalInsert(ctx context.Context, txn db.Ex, m model.Signal) (model.Signal, error) {

2
db/query/public/site.go
View file

@ -7,10 +7,10 @@ import (
//"time"
//"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table"
"github.com/go-jet/jet/v2/postgres"
)
func SiteFromAddressIDForOrg(ctx context.Context, txn db.Ex, address_id int64, org_id int64) (*model.Site, error) {

2
db/query/publicreport/compliance.go
View file

@ -5,10 +5,10 @@ import (
//"time"
//"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
"github.com/go-jet/jet/v2/postgres"
)
type ComplianceUpdater = db.Updater[table.ComplianceTable, model.Compliance]

2
db/query/publicreport/image.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func ImageInsert(ctx context.Context, txn db.Ex, m model.Image) (model.Image, error) {

2
db/query/publicreport/image_exif.go
View file

@ -8,7 +8,7 @@ import (
//"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/enum"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func ImageExifInserts(ctx context.Context, txn db.Ex, image_exifs []model.ImageExif) ([]model.ImageExif, error) {

2
db/query/publicreport/nuisance.go
View file

@ -7,7 +7,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func NuisanceInsert(ctx context.Context, txn db.Ex, m model.Nuisance) (model.Nuisance, error) {

2
db/query/publicreport/report.go
View file

@ -7,10 +7,10 @@ import (
//"time"
//"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/jet/postgres"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
"github.com/go-jet/jet/v2/postgres"
)
type ReportUpdater = db.Updater[table.ReportTable, model.Report]

2
db/query/publicreport/report_image.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func ReportImageInsert(ctx context.Context, txn db.Ex, m model.ReportImage) (model.ReportImage, error) {

2
db/query/publicreport/report_log.go
View file

@ -6,7 +6,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func ReportLogInsert(ctx context.Context, txn db.Ex, m model.ReportLog) (model.ReportLog, error) {

2
db/query/publicreport/water.go
View file

@ -7,7 +7,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/model"
"github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/publicreport/table"
//"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet/postgres"
)
func WaterInsert(ctx context.Context, txn db.Ex, m model.Water) (model.Water, error) {

4
db/updater.go
View file

@ -4,8 +4,8 @@ import (
"context"
"fmt"
//"github.com/go-jet/jet/v2"
"github.com/go-jet/jet/v2/postgres"
//"github.com/Gleipnir-Technology/jet"
"github.com/Gleipnir-Technology/jet/postgres"
)
type Updater[T postgres.Table, M any] struct {