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

fix imports to point at lbryio repo

Browse source
This commit is contained in:
Alex Grintsvayg 2017-05-08 13:25:15 -04:00
parent 687b0506db
commit 451723ccb9
22 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bdb/column.go
View file

@ -3,7 +3,7 @@ package bdb
import ( import (
"strings" "strings"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
// Column holds information about a database column. // Column holds information about a database column.

4
bdb/drivers/mock.go
View file

@ -1,8 +1,8 @@
package drivers package drivers
import ( import (
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
// MockDriver is a mock implementation of the bdb driver Interface // MockDriver is a mock implementation of the bdb driver Interface

2
bdb/drivers/mssql.go
View file

@ -8,7 +8,7 @@ import (
_ "github.com/denisenkom/go-mssqldb" _ "github.com/denisenkom/go-mssqldb"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
) )
// MSSQLDriver holds the database connection string and a handle // MSSQLDriver holds the database connection string and a handle

2
bdb/drivers/mysql.go
View file

@ -8,7 +8,7 @@ import (
"github.com/go-sql-driver/mysql" "github.com/go-sql-driver/mysql"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
) )
// TinyintAsBool is a global that is set from main.go if a user specifies // TinyintAsBool is a global that is set from main.go if a user specifies

4
bdb/drivers/postgres.go
View file

@ -10,8 +10,8 @@ import (
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
// PostgresDriver holds the database connection string and a handle // PostgresDriver holds the database connection string and a handle

2
bdb/interface_test.go
View file

@ -3,7 +3,7 @@ package bdb
import ( import (
"testing" "testing"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
type testMockDriver struct{} type testMockDriver struct{}

10
boilingcore/boilingcore.go
View file

@ -13,10 +13,10 @@ import (
"text/template" "text/template"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
"github.com/vattle/sqlboiler/bdb/drivers" "github.com/lbryio/sqlboiler/bdb/drivers"
"github.com/vattle/sqlboiler/queries" "github.com/lbryio/sqlboiler/queries"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
const ( const (
@ -267,7 +267,7 @@ func (s *State) processReplacements() error {
return nil return nil
} }
var basePackage = "github.com/vattle/sqlboiler" var basePackage = "github.com/lbryio/sqlboiler"
func getBasePath(baseDirConfig string) (string, error) { func getBasePath(baseDirConfig string) (string, error) {
if len(baseDirConfig) > 0 { if len(baseDirConfig) > 0 {

54
boilingcore/imports.go
View file

@ -6,7 +6,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
) )
// imports defines the optional standard imports and // imports defines the optional standard imports and
@ -171,25 +171,25 @@ func newImporter() importer {
}, },
thirdParty: importList{ thirdParty: importList{
`"github.com/pkg/errors"`, `"github.com/pkg/errors"`,
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
`"github.com/vattle/sqlboiler/queries"`, `"github.com/lbryio/sqlboiler/queries"`,
`"github.com/vattle/sqlboiler/queries/qm"`, `"github.com/lbryio/sqlboiler/queries/qm"`,
`"github.com/vattle/sqlboiler/strmangle"`, `"github.com/lbryio/sqlboiler/strmangle"`,
}, },
} }
imp.Singleton = mapImports{ imp.Singleton = mapImports{
"boil_queries": { "boil_queries": {
thirdParty: importList{ thirdParty: importList{
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
`"github.com/vattle/sqlboiler/queries"`, `"github.com/lbryio/sqlboiler/queries"`,
`"github.com/vattle/sqlboiler/queries/qm"`, `"github.com/lbryio/sqlboiler/queries/qm"`,
}, },
}, },
"boil_types": { "boil_types": {
thirdParty: importList{ thirdParty: importList{
`"github.com/pkg/errors"`, `"github.com/pkg/errors"`,
`"github.com/vattle/sqlboiler/strmangle"`, `"github.com/lbryio/sqlboiler/strmangle"`,
}, },
}, },
} }
@ -201,9 +201,9 @@ func newImporter() importer {
`"testing"`, `"testing"`,
}, },
thirdParty: importList{ thirdParty: importList{
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
`"github.com/vattle/sqlboiler/randomize"`, `"github.com/lbryio/sqlboiler/randomize"`,
`"github.com/vattle/sqlboiler/strmangle"`, `"github.com/lbryio/sqlboiler/strmangle"`,
}, },
} }
@ -223,7 +223,7 @@ func newImporter() importer {
`"github.com/kat-co/vala"`, `"github.com/kat-co/vala"`,
`"github.com/pkg/errors"`, `"github.com/pkg/errors"`,
`"github.com/spf13/viper"`, `"github.com/spf13/viper"`,
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
}, },
}, },
"boil_queries_test": { "boil_queries_test": {
@ -236,7 +236,7 @@ func newImporter() importer {
`"regexp"`, `"regexp"`,
}, },
thirdParty: importList{ thirdParty: importList{
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
}, },
}, },
"boil_suites_test": { "boil_suites_test": {
@ -261,8 +261,8 @@ func newImporter() importer {
thirdParty: importList{ thirdParty: importList{
`"github.com/pkg/errors"`, `"github.com/pkg/errors"`,
`"github.com/spf13/viper"`, `"github.com/spf13/viper"`,
`"github.com/vattle/sqlboiler/bdb/drivers"`, `"github.com/lbryio/sqlboiler/bdb/drivers"`,
`"github.com/vattle/sqlboiler/randomize"`, `"github.com/lbryio/sqlboiler/randomize"`,
`_ "github.com/lib/pq"`, `_ "github.com/lib/pq"`,
}, },
}, },
@ -280,8 +280,8 @@ func newImporter() importer {
thirdParty: importList{ thirdParty: importList{
`"github.com/pkg/errors"`, `"github.com/pkg/errors"`,
`"github.com/spf13/viper"`, `"github.com/spf13/viper"`,
`"github.com/vattle/sqlboiler/bdb/drivers"`, `"github.com/lbryio/sqlboiler/bdb/drivers"`,
`"github.com/vattle/sqlboiler/randomize"`, `"github.com/lbryio/sqlboiler/randomize"`,
`_ "github.com/go-sql-driver/mysql"`, `_ "github.com/go-sql-driver/mysql"`,
}, },
}, },
@ -297,8 +297,8 @@ func newImporter() importer {
thirdParty: importList{ thirdParty: importList{
`"github.com/pkg/errors"`, `"github.com/pkg/errors"`,
`"github.com/spf13/viper"`, `"github.com/spf13/viper"`,
`"github.com/vattle/sqlboiler/bdb/drivers"`, `"github.com/lbryio/sqlboiler/bdb/drivers"`,
`"github.com/vattle/sqlboiler/randomize"`, `"github.com/lbryio/sqlboiler/randomize"`,
`_ "github.com/denisenkom/go-mssqldb"`, `_ "github.com/denisenkom/go-mssqldb"`,
}, },
}, },
@ -363,25 +363,25 @@ func newImporter() importer {
standard: importList{`"time"`}, standard: importList{`"time"`},
}, },
"types.JSON": { "types.JSON": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
"types.BytesArray": { "types.BytesArray": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
"types.Int64Array": { "types.Int64Array": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
"types.Float64Array": { "types.Float64Array": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
"types.BoolArray": { "types.BoolArray": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
"types.StringArray": { "types.StringArray": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
"types.Hstore": { "types.Hstore": {
thirdParty: importList{`"github.com/vattle/sqlboiler/types"`}, thirdParty: importList{`"github.com/lbryio/sqlboiler/types"`},
}, },
} }

16
boilingcore/imports_test.go
View file

@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
) )
func TestImportsSort(t *testing.T) { func TestImportsSort(t *testing.T) {
@ -234,7 +234,7 @@ func TestCombineTypeImports(t *testing.T) {
`"fmt"`, `"fmt"`,
}, },
thirdParty: importList{ thirdParty: importList{
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
}, },
} }
@ -245,7 +245,7 @@ func TestCombineTypeImports(t *testing.T) {
`"time"`, `"time"`,
}, },
thirdParty: importList{ thirdParty: importList{
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
`"gopkg.in/nullbio/null.v6"`, `"gopkg.in/nullbio/null.v6"`,
}, },
} }
@ -280,7 +280,7 @@ func TestCombineTypeImports(t *testing.T) {
`"time"`, `"time"`,
}, },
thirdParty: importList{ thirdParty: importList{
`"github.com/vattle/sqlboiler/boil"`, `"github.com/lbryio/sqlboiler/boil"`,
`"gopkg.in/nullbio/null.v6"`, `"gopkg.in/nullbio/null.v6"`,
}, },
} }
@ -297,11 +297,11 @@ func TestCombineImports(t *testing.T) {
a := imports{ a := imports{
standard: importList{"fmt"}, standard: importList{"fmt"},
thirdParty: importList{"github.com/vattle/sqlboiler", "gopkg.in/nullbio/null.v6"}, thirdParty: importList{"github.com/lbryio/sqlboiler", "gopkg.in/nullbio/null.v6"},
} }
b := imports{ b := imports{
standard: importList{"os"}, standard: importList{"os"},
thirdParty: importList{"github.com/vattle/sqlboiler"}, thirdParty: importList{"github.com/lbryio/sqlboiler"},
} }
c := combineImports(a, b) c := combineImports(a, b)
@ -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/vattle/sqlboiler" && c.thirdParty[1] != "gopkg.in/nullbio/null.v6" { if c.thirdParty[0] != "github.com/lbryio/sqlboiler" && c.thirdParty[1] != "gopkg.in/nullbio/null.v6" {
t.Errorf("Wanted: github.com/vattle/sqlboiler, gopkg.in/nullbio/null.v6 got: %#v", c.thirdParty) t.Errorf("Wanted: github.com/lbryio/sqlboiler, gopkg.in/nullbio/null.v6 got: %#v", c.thirdParty)
} }
} }

2
boilingcore/output.go
View file

@ -14,7 +14,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
var noEditDisclaimer = []byte(`// This file is generated by SQLBoiler (https://github.com/vattle/sqlboiler) var noEditDisclaimer = []byte(`// This file is generated by SQLBoiler (https://github.com/lbryio/sqlboiler)
// and is meant to be re-generated in place and/or deleted at any time. // and is meant to be re-generated in place and/or deleted at any time.
// DO NOT EDIT // DO NOT EDIT

6
boilingcore/templates.go
View file

@ -9,9 +9,9 @@ import (
"text/template" "text/template"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
"github.com/vattle/sqlboiler/queries" "github.com/lbryio/sqlboiler/queries"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
// templateData for sqlboiler templates // templateData for sqlboiler templates

4
boilingcore/text_helpers.go
View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
// TxtToOne contains text that will be used by templates for a one-to-many or // TxtToOne contains text that will be used by templates for a one-to-many or

4
boilingcore/text_helpers_test.go
View file

@ -5,8 +5,8 @@ import (
"testing" "testing"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/vattle/sqlboiler/bdb" "github.com/lbryio/sqlboiler/bdb"
"github.com/vattle/sqlboiler/bdb/drivers" "github.com/lbryio/sqlboiler/bdb/drivers"
) )
func TestTxtsFromOne(t *testing.T) { func TestTxtsFromOne(t *testing.T) {

6
main.go
View file

@ -10,8 +10,8 @@ import (
"github.com/kat-co/vala" "github.com/kat-co/vala"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/vattle/sqlboiler/bdb/drivers" "github.com/lbryio/sqlboiler/bdb/drivers"
"github.com/vattle/sqlboiler/boilingcore" "github.com/lbryio/sqlboiler/boilingcore"
) )
const sqlBoilerVersion = "2.3.0" const sqlBoilerVersion = "2.3.0"
@ -62,7 +62,7 @@ func main() {
Use: "sqlboiler [flags] <driver>", Use: "sqlboiler [flags] <driver>",
Short: "SQL Boiler generates an ORM tailored to your database schema.", Short: "SQL Boiler generates an ORM tailored to your database schema.",
Long: "SQL Boiler generates a Go ORM from template files, tailored to your database schema.\n" + Long: "SQL Boiler generates a Go ORM from template files, tailored to your database schema.\n" +
`Complete documentation is available at http://github.com/vattle/sqlboiler`, `Complete documentation is available at http://github.com/lbryio/sqlboiler`,
Example: `sqlboiler postgres`, Example: `sqlboiler postgres`,
PreRunE: preRun, PreRunE: preRun,
RunE: run, RunE: run,

4
queries/eager_load.go
View file

@ -6,8 +6,8 @@ import (
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/boil" "github.com/lbryio/sqlboiler/boil"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
type loadRelationshipState struct { type loadRelationshipState struct {

2
queries/eager_load_test.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/vattle/sqlboiler/boil" "github.com/lbryio/sqlboiler/boil"
) )
var testEagerCounters struct { var testEagerCounters struct {

2
queries/helpers.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
// NonZeroDefaultSet returns the fields included in the // NonZeroDefaultSet returns the fields included in the

2
queries/qm/query_mods.go
View file

@ -1,6 +1,6 @@
package qm package qm
import "github.com/vattle/sqlboiler/queries" import "github.com/lbryio/sqlboiler/queries"
// QueryMod to modify the query object // QueryMod to modify the query object
type QueryMod func(q *queries.Query) type QueryMod func(q *queries.Query)

2
queries/query.go
View file

@ -4,7 +4,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/vattle/sqlboiler/boil" "github.com/lbryio/sqlboiler/boil"
) )
// joinKind is the type of join // joinKind is the type of join

2
queries/query_builders.go
View file

@ -7,7 +7,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
var ( var (

4
queries/reflect.go
View file

@ -8,8 +8,8 @@ import (
"sync" "sync"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/vattle/sqlboiler/boil" "github.com/lbryio/sqlboiler/boil"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
) )
var ( var (

4
randomize/randomize.go
View file

@ -18,8 +18,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/satori/go.uuid" "github.com/satori/go.uuid"
"github.com/vattle/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
"github.com/vattle/sqlboiler/types" "github.com/lbryio/sqlboiler/types"
) )
var ( var (