Skip to content

Migrate to aarondl sqlboiler path #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate to aarondl sqlboiler path #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions driver/crdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"regexp"
"strings"

"github.com/aarondl/sqlboiler/v4/drivers"
"github.com/aarondl/sqlboiler/v4/importers"
"github.com/aarondl/strmangle"
"github.com/glerchundi/sqlboiler-crdb/v4/driver/override"
_ "github.com/lib/pq" // Side-effect import sql driver
"github.com/volatiletech/sqlboiler/v4/drivers"
"github.com/volatiletech/sqlboiler/v4/importers"
"github.com/volatiletech/strmangle"
)

var re = regexp.MustCompile(`\(([^\)]+)\)`)
Expand Down Expand Up @@ -554,8 +554,8 @@ func (d *CockroachDBDriver) Imports() (importers.Collection, error) {
`"strings"`,
},
ThirdParty: importers.List{
`"github.com/volatiletech/strmangle"`,
`"github.com/volatiletech/sqlboiler/v4/drivers"`,
`"github.com/aarondl/strmangle"`,
`"github.com/aarondl/sqlboiler/v4/drivers"`,
},
},
}
Expand All @@ -578,92 +578,92 @@ func (d *CockroachDBDriver) Imports() (importers.Collection, error) {
},
ThirdParty: importers.List{
`"github.com/spf13/viper"`,
`"github.com/volatiletech/randomize"`,
`"github.com/aarondl/randomize"`,
`_ "github.com/lib/pq"`,
},
},
}
col.BasedOnType = importers.Map{
"null.Float32": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Float64": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Int": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Int8": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Int16": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Int32": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Int64": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Uint": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Uint8": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Uint16": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Uint32": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Uint64": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.String": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Bool": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Time": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.JSON": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"null.Bytes": {
ThirdParty: importers.List{`"github.com/volatiletech/null/v8"`},
ThirdParty: importers.List{`"github.com/aarondl/null/v8"`},
},
"time.Time": {
Standard: importers.List{`"time"`},
},
"types.JSON": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.Decimal": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.BytesArray": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.Int64Array": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.Float64Array": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.BoolArray": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.StringArray": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.DecimalArray": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
"types.NullDecimal": {
ThirdParty: importers.List{`"github.com/volatiletech/sqlboiler/v4/types"`},
ThirdParty: importers.List{`"github.com/aarondl/sqlboiler/v4/types"`},
},
}

Expand Down
2 changes: 1 addition & 1 deletion driver/crdb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"strconv"
"testing"

"github.com/volatiletech/sqlboiler/v4/drivers"
"github.com/aarondl/sqlboiler/v4/drivers"
)

var (
Expand Down
16 changes: 9 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
module github.com/glerchundi/sqlboiler-crdb/v4

go 1.18
go 1.23.0

toolchain go1.24.4

require (
github.com/lib/pq v1.5.1
github.com/volatiletech/sqlboiler/v4 v4.10.2
github.com/volatiletech/strmangle v0.0.3
github.com/aarondl/sqlboiler/v4 v4.19.5
github.com/aarondl/strmangle v0.0.9
github.com/lib/pq v1.10.6
)

require (
github.com/aarondl/inflect v0.0.2 // indirect
github.com/friendsofgo/errors v0.9.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/volatiletech/inflect v0.0.1 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
github.com/spf13/cast v1.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
)
Loading