LBRYCommunity/sqlboiler
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #4 from lbryio/lbrygo_update

Browse source 
Updated to use the latest lbry.go changes
This commit is contained in:
Mark 2019-01-10 20:13:22 -05:00 committed by GitHub
commit d180a095ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
boilingcore/imports.go
View file

@ -170,8 +170,8 @@ func newImporter() importer {
`"time"`,
},
thirdParty: importList{
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/null"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/lbry.go/extras/null"`,
`"github.com/lbryio/sqlboiler/boil"`,
`"github.com/lbryio/sqlboiler/queries"`,
`"github.com/lbryio/sqlboiler/queries/qm"`,
@ -185,7 +185,7 @@ func newImporter() importer {
`"fmt"`,
},
thirdParty: importList{
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/sqlboiler/boil"`,
`"github.com/lbryio/sqlboiler/queries"`,
`"github.com/lbryio/sqlboiler/queries/qm"`,
@ -194,7 +194,7 @@ func newImporter() importer {
},
"boil_types": {
thirdParty: importList{
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/sqlboiler/strmangle"`,
},
},
@ -227,7 +227,7 @@ func newImporter() importer {
},
thirdParty: importList{
`"github.com/kat-co/vala"`,
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/sqlboiler/boil"`,
`"github.com/spf13/viper"`,
},
@ -265,7 +265,7 @@ func newImporter() importer {
`"strings"`,
},
thirdParty: importList{
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/sqlboiler/bdb/drivers"`,
`"github.com/lbryio/sqlboiler/randomize"`,
`_ "github.com/lib/pq"`,
@ -285,7 +285,7 @@ func newImporter() importer {
},
thirdParty: importList{
`_ "github.com/go-sql-driver/mysql"`,
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/sqlboiler/bdb/drivers"`,
`"github.com/lbryio/sqlboiler/randomize"`,
`"github.com/spf13/viper"`,
@ -302,7 +302,7 @@ func newImporter() importer {
},
thirdParty: importList{
`_ "github.com/denisenkom/go-mssqldb"`,
`"github.com/lbryio/lbry.go/errors"`,
`"github.com/lbryio/lbry.go/extras/errors"`,
`"github.com/lbryio/sqlboiler/bdb/drivers"`,
`"github.com/lbryio/sqlboiler/randomize"`,
`"github.com/spf13/viper"`,
@ -315,55 +315,55 @@ func newImporter() importer {
// TranslateColumnType to see the type assignments.
imp.BasedOnType = mapImports{
"null.Float32": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Float64": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Int": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Int8": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Int16": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Int32": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Int64": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Uint": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Uint8": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Uint16": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Uint32": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Uint64": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.String": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Bool": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Time": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.JSON": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"null.Bytes": {
thirdParty: importList{`"github.com/lbryio/lbry.go/null"`},
thirdParty: importList{`"github.com/lbryio/lbry.go/extras/null"`},
},
"time.Time": {
standard: importList{`"time"`},

10
boilingcore/imports_test.go
View file

@ -246,7 +246,7 @@ func TestCombineTypeImports(t *testing.T) {
},
thirdParty: importList{
`"github.com/lbryio/sqlboiler/boil"`,
`"github.com/lbryio/lbry.go/null"`,
`"github.com/lbryio/lbry.go/extras/null"`,
},
}
@ -281,7 +281,7 @@ func TestCombineTypeImports(t *testing.T) {
},
thirdParty: importList{
`"github.com/lbryio/sqlboiler/boil"`,
`"github.com/lbryio/lbry.go/null"`,
`"github.com/lbryio/lbry.go/extras/null"`,
},
}
@ -297,7 +297,7 @@ func TestCombineImports(t *testing.T) {
a := imports{
standard: importList{"fmt"},
thirdParty: importList{"github.com/lbryio/sqlboiler", "github.com/lbryio/lbry.go/null"},
thirdParty: importList{"github.com/lbryio/sqlboiler", "github.com/lbryio/lbry.go/extras/null"},
}
b := imports{
standard: importList{"os"},
@ -309,8 +309,8 @@ func TestCombineImports(t *testing.T) {
if c.standard[0] != "fmt" && c.standard[1] != "os" {
t.Errorf("Wanted: fmt, os got: %#v", c.standard)
}
if c.thirdParty[0] != "github.com/lbryio/sqlboiler" && c.thirdParty[1] != "github.com/lbryio/lbry.go/null" {
t.Errorf("Wanted: github.com/lbryio/sqlboiler, github.com/lbryio/lbry.go/null got: %#v", c.thirdParty)
if c.thirdParty[0] != "github.com/lbryio/sqlboiler" && c.thirdParty[1] != "github.com/lbryio/lbry.go/extras/null" {
t.Errorf("Wanted: github.com/lbryio/sqlboiler, github.com/lbryio/lbry.go/extras/null got: %#v", c.thirdParty)
}
}

2
queries/helpers_test.go
View file

@ -5,7 +5,7 @@ import (
"testing"
"time"
null "github.com/lbryio/lbry.go/null"
null "github.com/lbryio/lbry.go/extras/null"
)
type testObj struct {

2
queries/query.go
View file

@ -4,7 +4,7 @@ import (
"database/sql"
"fmt"
"github.com/lbryio/lbry.go/errors"
"github.com/lbryio/lbry.go/extras/errors"
"github.com/lbryio/sqlboiler/boil"
)

2
randomize/randomize.go
View file

@ -14,7 +14,7 @@ import (
"sync/atomic"
"time"
null "github.com/lbryio/lbry.go/null"
null "github.com/lbryio/lbry.go/extras/null"
"github.com/pkg/errors"
"github.com/satori/go.uuid"

2
randomize/randomize_test.go
View file

@ -5,7 +5,7 @@ import (
"testing"
"time"
null "github.com/lbryio/lbry.go/null"
null "github.com/lbryio/lbry.go/extras/null"
)
func TestRandomizeStruct(t *testing.T) {