From f80f632fc0c47c41e8e47ec4f7f6331b29c7be41 Mon Sep 17 00:00:00 2001 From: Dan Willoughby Date: Sat, 9 Jan 2021 15:26:53 -0700 Subject: [PATCH] update inflect dependency It's updated to a deprecated one, but seems to work --- code/golang/helpers.go | 2 +- code/golang/var.go | 2 +- go.mod | 4 +++- go.sum | 8 ++++++++ ir/xform/transform_model.go | 2 +- tmplutil/loader.go | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/golang/helpers.go b/code/golang/helpers.go index af5cee4..7814ed5 100644 --- a/code/golang/helpers.go +++ b/code/golang/helpers.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "bitbucket.org/pkg/inflect" + "github.com/markbates/inflect" "gopkg.in/spacemonkeygo/dbx.v1/ir" "gopkg.in/spacemonkeygo/dbx.v1/sqlgen/sqlembedgo" ) diff --git a/code/golang/var.go b/code/golang/var.go index a149755..db9ad6a 100644 --- a/code/golang/var.go +++ b/code/golang/var.go @@ -17,7 +17,7 @@ package golang import ( "fmt" - "bitbucket.org/pkg/inflect" + "github.com/markbates/inflect" "gopkg.in/spacemonkeygo/dbx.v1/consts" "gopkg.in/spacemonkeygo/dbx.v1/ir" ) diff --git a/go.mod b/go.mod index c4c6dd1..a7def38 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,11 @@ module gopkg.in/spacemonkeygo/dbx.v1 +go 1.15 + require ( - bitbucket.org/pkg/inflect v0.0.0-20130829110746-8961c3750a47 github.com/jawher/mow.cli v1.0.4 github.com/lib/pq v1.0.0 + github.com/markbates/inflect v1.0.4 github.com/mattn/go-sqlite3 v1.10.0 github.com/spacemonkeygo/errors v0.0.0-20171212215202-9064522e9fd1 github.com/stretchr/testify v1.3.0 // indirect diff --git a/go.sum b/go.sum index 31c29df..21b6a74 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,17 @@ bitbucket.org/pkg/inflect v0.0.0-20130829110746-8961c3750a47 h1:XDrztcXGcx7jow3U bitbucket.org/pkg/inflect v0.0.0-20130829110746-8961c3750a47/go.mod h1:8Rt8gHhG+tKz8P3SoEzL/ZNVl25fPhMFKItv5HLIdtY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gobuffalo/envy v1.6.5 h1:X3is06x7v0nW2xiy2yFbbIjwHz57CD6z6MkvqULTCm8= +github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ= github.com/jawher/mow.cli v1.0.4 h1:hKjm95J7foZ2ngT8tGb15Aq9rj751R7IUDjG+5e3cGA= github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/markbates/inflect v1.0.4 h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g= +github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs= github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -13,6 +20,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/spacemonkeygo/errors v0.0.0-20171212215202-9064522e9fd1 h1:xHQewZjohU9/wUsyC99navCjQDNHtTgUOM/J1jAbzfw= github.com/spacemonkeygo/errors v0.0.0-20171212215202-9064522e9fd1/go.mod h1:7NL9UAYQnRM5iKHUCld3tf02fKb5Dft+41+VckASUy0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80= diff --git a/ir/xform/transform_model.go b/ir/xform/transform_model.go index 72c6e4f..2ed3fbc 100644 --- a/ir/xform/transform_model.go +++ b/ir/xform/transform_model.go @@ -17,7 +17,7 @@ package xform import ( "fmt" - "bitbucket.org/pkg/inflect" + "github.com/markbates/inflect" "gopkg.in/spacemonkeygo/dbx.v1/ast" "gopkg.in/spacemonkeygo/dbx.v1/errutil" "gopkg.in/spacemonkeygo/dbx.v1/ir" diff --git a/tmplutil/loader.go b/tmplutil/loader.go index 4750c12..d06ce33 100644 --- a/tmplutil/loader.go +++ b/tmplutil/loader.go @@ -20,7 +20,7 @@ import ( "path/filepath" "text/template" - "bitbucket.org/pkg/inflect" + "github.com/markbates/inflect" ) type Loader interface {