update lbry.go library

This commit is contained in:
Niko Storni 2020-02-10 14:49:11 +01:00 committed by Jeremy Kauffman
parent 3f035a9fe2
commit 256a6d4225
6 changed files with 34 additions and 34 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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