Skip to content

Commit

Permalink
Bump struct-db-postgres version
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikogs
mikogs committed Dec 27, 2024
1 parent f89c416 commit 74991b1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ in the database.

```
import (
crud "github.com/mikolajgs/prototyping/pkg/rest-api"
crud "github.com/go-phings/crud"
)
```

Expand Down
9 changes: 2 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ module github.com/go-phings/crud
go 1.23.4

require (
github.com/go-phings/struct-db-postgres v0.6.0
github.com/go-phings/struct-sql-postgres v0.6.0
github.com/go-phings/struct-db-postgres v0.7.0
github.com/go-phings/struct-validator v0.4.7
github.com/lib/pq v1.10.9
github.com/mikolajgs/prototyping/pkg/umbrella v0.0.0-20241129204714-bf573dcaf2c8
github.com/ory/dockertest/v3 v3.11.0
)

Expand All @@ -18,15 +16,13 @@ require (
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/docker/cli v26.1.4+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/go-phings/struct-sql-postgres v0.7.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/mikolajgs/prototyping v0.2.1 // indirect
github.com/mikolajgs/struct-validator v0.4.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
Expand All @@ -39,7 +35,6 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/sys v0.27.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
18 changes: 4 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwenxRM7/rLu8=
github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
Expand All @@ -27,10 +25,10 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/go-phings/struct-db-postgres v0.6.0 h1:EbxRIrkwF2cDdTYr5TUJ2Ot3N+xSvKUxY4brJGIuloA=
github.com/go-phings/struct-db-postgres v0.6.0/go.mod h1:Yw7QdVcY6NZGp/gbn4sVGZLiCJF7YZR9mFx2HuWS+i0=
github.com/go-phings/struct-sql-postgres v0.6.0 h1:GvaiSnywCnA4RtRfQEkYOtNwnykKHW158if0Yoi8jCs=
github.com/go-phings/struct-sql-postgres v0.6.0/go.mod h1:bII8gzJnuAn7Ht+NEmHnyieu53EYnHhGg5EeY893yeE=
github.com/go-phings/struct-db-postgres v0.7.0 h1:s3vWoPpEni1HzGF68L8b0cFO/dl8iQeWQ0jYkQhcVLs=
github.com/go-phings/struct-db-postgres v0.7.0/go.mod h1:Yw7QdVcY6NZGp/gbn4sVGZLiCJF7YZR9mFx2HuWS+i0=
github.com/go-phings/struct-sql-postgres v0.7.0 h1:E18btNpiBWkgMJdYLXjKv7qXOAJzrjfTu3nySynKDWs=
github.com/go-phings/struct-sql-postgres v0.7.0/go.mod h1:bII8gzJnuAn7Ht+NEmHnyieu53EYnHhGg5EeY893yeE=
github.com/go-phings/struct-validator v0.4.7 h1:qHCkn2ppOnzRxzE3+UCXD2+4bMp4xWtEcl5S/TKebRo=
github.com/go-phings/struct-validator v0.4.7/go.mod h1:i+WCf5KGFnxiGdrtqsysAaIACvE5K+h5X/R8gPJQPB0=
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
Expand All @@ -41,16 +39,10 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mikolajgs/prototyping v0.2.1 h1:bkC/3Td5A6QtEHfv66i36Jamjj7zJI/T5zUoyC+KvTs=
github.com/mikolajgs/prototyping v0.2.1/go.mod h1:1O3vsOStgBfkTV6/y7bywkoySfPHt3lfFT74fQe6iqk=
github.com/mikolajgs/prototyping/pkg/umbrella v0.0.0-20241129204714-bf573dcaf2c8 h1:rJKU3AT0bChaCe8B53J+zPOT6TzicU4QlDW/uhial00=
github.com/mikolajgs/prototyping/pkg/umbrella v0.0.0-20241129204714-bf573dcaf2c8/go.mod h1:rOkaJr2iIHXW3WexmwqqXRVEcC9dmHnV34II60WKOcM=
github.com/mikolajgs/struct-validator v0.4.7 h1:6kBLsnBqC5KQpwY07n3yiqFUK3hm+f4KuHcYSceN4kY=
github.com/mikolajgs/struct-validator v0.4.7/go.mod h1:Ks0Lm870PpN0ZuQ+LDKYhCazSNyN3zvX5NrFxwlS69g=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
Expand Down Expand Up @@ -90,8 +82,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
Expand Down
12 changes: 6 additions & 6 deletions orm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ func (w *wrappedStruct2db) Get(newObjFunc func() interface{}, order []string, li
RowObjTransformFunc: rowObjTransformFunc,
})

if err != nil && err.Op == "ValidateFilters" {
if err != nil && err.(struct2db.ErrController).Op == "ValidateFilters" {
return nil, ormErrorImpl{
op: err.Op,
op: err.(struct2db.ErrController).Op,
}
}

if err != nil {
return nil, ormErrorImpl{
op: err.Op,
err: err.Err,
op: err.(struct2db.ErrController).Op,
err: err.(struct2db.ErrController).Err,
}
}

Expand All @@ -157,8 +157,8 @@ func (w *wrappedStruct2db) RegisterStruct(obj interface{}, inheritFromObj interf
err := w.orm.AddSQLGenerator(obj, inheritFromObj, overwriteExisting, forceNameForDB, useOnlyRootFromInheritedObj)
if err != nil {
return ormErrorImpl{
op: err.Op,
err: err.Err,
op: err.(struct2db.ErrController).Op,
err: err.(struct2db.ErrController).Err,
}
}
return nil
Expand Down

0 comments on commit 74991b1

Please sign in to comment.