diff --git a/db/connection.go b/db/connection.go index d0397aa3..b79e039c 100644 --- a/db/connection.go +++ b/db/connection.go @@ -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" diff --git a/db/jet/main.go b/db/jet/main.go index b4cf122c..11828cf5 100644 --- a/db/jet/main.go +++ b/db/jet/main.go @@ -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" ) diff --git a/db/query/arcgis/account.go b/db/query/arcgis/account.go index d189c777..6dfbcef1 100644 --- a/db/query/arcgis/account.go +++ b/db/query/arcgis/account.go @@ -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) { diff --git a/db/query/arcgis/oauth.go b/db/query/arcgis/oauth.go index cb1f3ce4..ed5d2ef5 100644 --- a/db/query/arcgis/oauth.go +++ b/db/query/arcgis/oauth.go @@ -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) { diff --git a/db/query/arcgis/service_feature.go b/db/query/arcgis/service_feature.go index d3b5d094..64999d06 100644 --- a/db/query/arcgis/service_feature.go +++ b/db/query/arcgis/service_feature.go @@ -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) { diff --git a/db/query/arcgis/service_map.go b/db/query/arcgis/service_map.go index 586af32d..def2a5d5 100644 --- a/db/query/arcgis/service_map.go +++ b/db/query/arcgis/service_map.go @@ -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) { diff --git a/db/query/arcgis/user.go b/db/query/arcgis/user.go index ede1d25c..dd2546a9 100644 --- a/db/query/arcgis/user.go +++ b/db/query/arcgis/user.go @@ -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) { diff --git a/db/query/arcgis/user_privileges.go b/db/query/arcgis/user_privileges.go index d3da5005..aaa8f529 100644 --- a/db/query/arcgis/user_privileges.go +++ b/db/query/arcgis/user_privileges.go @@ -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 { diff --git a/db/query/public/address.go b/db/query/public/address.go index 9f359bec..ad133a4a 100644 --- a/db/query/public/address.go +++ b/db/query/public/address.go @@ -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) { diff --git a/db/query/public/communication.go b/db/query/public/communication.go index da24532b..e64efabc 100644 --- a/db/query/public/communication.go +++ b/db/query/public/communication.go @@ -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) { diff --git a/db/query/public/communication_log_entry.go b/db/query/public/communication_log_entry.go index 7ed2e5f2..0eca6372 100644 --- a/db/query/public/communication_log_entry.go +++ b/db/query/public/communication_log_entry.go @@ -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) { diff --git a/db/query/public/compliance_report_request.go b/db/query/public/compliance_report_request.go index 0c1d6478..9738e1d8 100644 --- a/db/query/public/compliance_report_request.go +++ b/db/query/public/compliance_report_request.go @@ -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) { diff --git a/db/query/public/feature.go b/db/query/public/feature.go index adc5dbd6..7d331f8c 100644 --- a/db/query/public/feature.go +++ b/db/query/public/feature.go @@ -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) { diff --git a/db/query/public/feature_pool.go b/db/query/public/feature_pool.go index abc7dd98..9c6b2d2d 100644 --- a/db/query/public/feature_pool.go +++ b/db/query/public/feature_pool.go @@ -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) { diff --git a/db/query/public/job.go b/db/query/public/job.go index f574b6cf..d221f108 100644 --- a/db/query/public/job.go +++ b/db/query/public/job.go @@ -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) { diff --git a/db/query/public/lead.go b/db/query/public/lead.go index ce2f4f32..fb513b93 100644 --- a/db/query/public/lead.go +++ b/db/query/public/lead.go @@ -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) { diff --git a/db/query/public/signal.go b/db/query/public/signal.go index 8c95aa44..5f76f1ec 100644 --- a/db/query/public/signal.go +++ b/db/query/public/signal.go @@ -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) { diff --git a/db/query/public/site.go b/db/query/public/site.go index de634884..e2f54d09 100644 --- a/db/query/public/site.go +++ b/db/query/public/site.go @@ -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) { diff --git a/db/query/publicreport/compliance.go b/db/query/publicreport/compliance.go index df38265a..49b574e6 100644 --- a/db/query/publicreport/compliance.go +++ b/db/query/publicreport/compliance.go @@ -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] diff --git a/db/query/publicreport/image.go b/db/query/publicreport/image.go index 3b0153eb..5d616e38 100644 --- a/db/query/publicreport/image.go +++ b/db/query/publicreport/image.go @@ -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) { diff --git a/db/query/publicreport/image_exif.go b/db/query/publicreport/image_exif.go index f7dbd312..8c21fd6f 100644 --- a/db/query/publicreport/image_exif.go +++ b/db/query/publicreport/image_exif.go @@ -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) { diff --git a/db/query/publicreport/nuisance.go b/db/query/publicreport/nuisance.go index 3f6687c6..c392daca 100644 --- a/db/query/publicreport/nuisance.go +++ b/db/query/publicreport/nuisance.go @@ -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) { diff --git a/db/query/publicreport/report.go b/db/query/publicreport/report.go index 89e9d731..7236b8ac 100644 --- a/db/query/publicreport/report.go +++ b/db/query/publicreport/report.go @@ -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] diff --git a/db/query/publicreport/report_image.go b/db/query/publicreport/report_image.go index 2f067ab6..b1c94dc0 100644 --- a/db/query/publicreport/report_image.go +++ b/db/query/publicreport/report_image.go @@ -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) { diff --git a/db/query/publicreport/report_log.go b/db/query/publicreport/report_log.go index bd0a2b23..b5ebc251 100644 --- a/db/query/publicreport/report_log.go +++ b/db/query/publicreport/report_log.go @@ -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) { diff --git a/db/query/publicreport/water.go b/db/query/publicreport/water.go index 39d497b5..483f879d 100644 --- a/db/query/publicreport/water.go +++ b/db/query/publicreport/water.go @@ -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) { diff --git a/db/updater.go b/db/updater.go index eb36bcb0..809df8f0 100644 --- a/db/updater.go +++ b/db/updater.go @@ -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 { diff --git a/go.mod b/go.mod index 306416ef..c04012b5 100644 --- a/go.mod +++ b/go.mod @@ -45,6 +45,7 @@ require ( ) require ( + github.com/Gleipnir-Technology/jet v0.0.0-20260509014340-4474319e732c // indirect github.com/andybalholm/brotli v1.2.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/beevik/etree v1.1.0 // indirect @@ -60,11 +61,8 @@ require ( github.com/golang-jwt/jwt/v5 v5.2.2 // indirect github.com/golang/mock v1.6.0 // indirect github.com/invopop/jsonschema v0.13.0 // indirect - github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgtype v1.14.4 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect diff --git a/go.sum b/go.sum index e603d5bf..3e7d339b 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,8 @@ github.com/Gleipnir-Technology/bob v0.42.5 h1:fm4vH48E7scLwMFSJ4fX3+q2wSo+6Iphh+ github.com/Gleipnir-Technology/bob v0.42.5/go.mod h1:cjUNiSRIMBsk94NQQrpYoraCe0WxIc04C8A+PcJ5z8Q= github.com/Gleipnir-Technology/go-geojson2h3/v2 v2.0.0 h1:6OMVxoiX9r7dEkIyYYKtSu7I2UDq64dww4JxJTo3p78= github.com/Gleipnir-Technology/go-geojson2h3/v2 v2.0.0/go.mod h1:W77HoRoEXUWAc24AbDHIaSH2U4vJNWgNRpEuySXzqDs= +github.com/Gleipnir-Technology/jet v0.0.0-20260509014340-4474319e732c h1:82ZQmVaLDaaCqCecskoFPBWrxppxqQnDGmidfmrIrE0= +github.com/Gleipnir-Technology/jet v0.0.0-20260509014340-4474319e732c/go.mod h1:KWZfjR3z//4PM8tTZ5isMAO58uudK//BhX/yx7nAT2w= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= @@ -87,8 +89,6 @@ github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxI github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= -github.com/go-jet/jet/v2 v2.14.1 h1:wsfD9e7CGP9h46+IFNlftfncBcmVnKddikbTtapQM3M= -github.com/go-jet/jet/v2 v2.14.1/go.mod h1:dqTAECV2Mo3S2NFjbm4vJ1aDruZjhaJ1RAAR8rGUkkc= github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9pEquQS5jTGkh4AqeeHCMbfbjeb0zMt0aEFzs= github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= @@ -136,6 +136,7 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E= github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -152,10 +153,10 @@ github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= @@ -180,9 +181,8 @@ github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.18.2 h1:xVpYkNR5pk5bMCZGfClbO962UIqVABcAGt7ha1s/FeU= github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= -github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= -github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/pgx/v5 v5.5.4/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk= github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= diff --git a/platform/communication.go b/platform/communication.go index 1e6bb69a..15e385b5 100644 --- a/platform/communication.go +++ b/platform/communication.go @@ -10,7 +10,7 @@ import ( "github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/model" querypublic "github.com/Gleipnir-Technology/nidus-sync/db/query/public" "github.com/Gleipnir-Technology/nidus-sync/lint" - //"github.com/go-jet/jet/v2/postgres" + //"github.com/Gleipnir-Technology/jet/postgres" ) func CommunicationsForOrganization(ctx context.Context, org_id int64) ([]model.Communication, error) { diff --git a/platform/publicreport.go b/platform/publicreport.go index f70e4c18..4b5fe3ef 100644 --- a/platform/publicreport.go +++ b/platform/publicreport.go @@ -9,6 +9,7 @@ import ( "strings" "time" + "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" tablepublic "github.com/Gleipnir-Technology/nidus-sync/db/gen/nidus-sync/public/table" @@ -22,7 +23,6 @@ import ( "github.com/Gleipnir-Technology/nidus-sync/platform/publicreport" "github.com/Gleipnir-Technology/nidus-sync/platform/text" "github.com/Gleipnir-Technology/nidus-sync/platform/types" - "github.com/go-jet/jet/v2/postgres" "github.com/rs/zerolog/log" )