From 33286e648a6e16d34fc40d81b40e713805dd99d7 Mon Sep 17 00:00:00 2001 From: Patrick O'brien Date: Tue, 9 Aug 2016 17:59:30 +1000 Subject: [PATCH] Update repo to add vattle org paths --- README.md | 6 +++--- bdb/column.go | 2 +- bdb/drivers/postgres.go | 2 +- boil/helpers.go | 2 +- boil/qm/query_mods.go | 2 +- boil/query_builders.go | 2 +- boil/reflect.go | 2 +- boil/testing.go | 5 +++-- imports.go | 24 ++++++++++++------------ imports_test.go | 16 ++++++++-------- main.go | 2 +- sqlboiler.go | 4 ++-- sqlboiler_test.go | 2 +- templates.go | 4 ++-- text_helpers.go | 4 ++-- text_helpers_test.go | 4 ++-- 16 files changed, 42 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 98618fd..e10d803 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # SQLBoiler -[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/nullbio/sqlboiler/blob/master/LICENSE.md) +[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/vattle/sqlboiler/blob/master/LICENSE.md) [![GoDoc](https://godoc.org/github.com/pobri19/sqlboiler?status.svg)](https://godoc.org/github.com/pobri19/sqlboiler) -[![CircleCI](https://circleci.com/gh/nullbio/sqlboiler.svg?style=shield)](https://circleci.com/gh/nullbio/sqlboiler) -[![Go Report Card](https://goreportcard.com/badge/kubernetes/helm)](http://goreportcard.com/report/nullbio/sqlboiler) +[![CircleCI](https://circleci.com/gh/vattle/sqlboiler.svg?style=shield)](https://circleci.com/gh/vattle/sqlboiler) +[![Go Report Card](https://goreportcard.com/badge/kubernetes/helm)](http://goreportcard.com/report/vattle/sqlboiler) SQLBoiler is a tool to generate a Go ORM tailored to your database schema. diff --git a/bdb/column.go b/bdb/column.go index b80b8d1..a79f9d0 100644 --- a/bdb/column.go +++ b/bdb/column.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/nullbio/sqlboiler/strmangle" + "github.com/vattle/sqlboiler/strmangle" ) // Column holds information about a database column. diff --git a/bdb/drivers/postgres.go b/bdb/drivers/postgres.go index 04e2557..60cc05b 100644 --- a/bdb/drivers/postgres.go +++ b/bdb/drivers/postgres.go @@ -7,7 +7,7 @@ import ( // Side-effect import sql driver _ "github.com/lib/pq" - "github.com/nullbio/sqlboiler/bdb" + "github.com/vattle/sqlboiler/bdb" ) // PostgresDriver holds the database connection string and a handle diff --git a/boil/helpers.go b/boil/helpers.go index da1f890..b4bc6ab 100644 --- a/boil/helpers.go +++ b/boil/helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/nullbio/sqlboiler/strmangle" + "github.com/vattle/sqlboiler/strmangle" ) // SetComplement subtracts the elements in b from a diff --git a/boil/qm/query_mods.go b/boil/qm/query_mods.go index 7dcef11..5ab3148 100644 --- a/boil/qm/query_mods.go +++ b/boil/qm/query_mods.go @@ -1,6 +1,6 @@ package qm -import "github.com/nullbio/sqlboiler/boil" +import "github.com/vattle/sqlboiler/boil" // QueryMod to modify the query object type QueryMod func(q *boil.Query) diff --git a/boil/query_builders.go b/boil/query_builders.go index 07e39c8..726e2fc 100644 --- a/boil/query_builders.go +++ b/boil/query_builders.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/nullbio/sqlboiler/strmangle" + "github.com/vattle/sqlboiler/strmangle" ) var ( diff --git a/boil/reflect.go b/boil/reflect.go index 9298294..f4af760 100644 --- a/boil/reflect.go +++ b/boil/reflect.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" - "github.com/nullbio/sqlboiler/strmangle" "github.com/pkg/errors" + "github.com/vattle/sqlboiler/strmangle" ) var ( diff --git a/boil/testing.go b/boil/testing.go index 4f90ace..0911f72 100644 --- a/boil/testing.go +++ b/boil/testing.go @@ -9,9 +9,10 @@ import ( "strconv" "time" - "github.com/nullbio/sqlboiler/strmangle" + null "gopkg.in/nullbio/null.v4" + "github.com/satori/go.uuid" - "gopkg.in/nullbio/null.v4" + "github.com/vattle/sqlboiler/strmangle" ) var ( diff --git a/imports.go b/imports.go index 5ca3548..84aa6bd 100644 --- a/imports.go +++ b/imports.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/nullbio/sqlboiler/bdb" + "github.com/vattle/sqlboiler/bdb" ) // imports defines the optional standard imports and @@ -148,9 +148,9 @@ var defaultTemplateImports = imports{ `"strings"`, }, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, - `"github.com/nullbio/sqlboiler/boil/qm"`, - `"github.com/nullbio/sqlboiler/strmangle"`, + `"github.com/vattle/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil/qm"`, + `"github.com/vattle/sqlboiler/strmangle"`, }, } @@ -158,8 +158,8 @@ var defaultSingletonTemplateImports = map[string]imports{ "boil_helpers": { standard: importList{}, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, - `"github.com/nullbio/sqlboiler/boil/qm"`, + `"github.com/vattle/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil/qm"`, }, }, } @@ -172,9 +172,9 @@ var defaultTestTemplateImports = imports{ }, thirdParty: importList{ `"gopkg.in/nullbio/null.v4"`, - `"github.com/nullbio/sqlboiler/boil"`, - `"github.com/nullbio/sqlboiler/boil/qm"`, - `"github.com/nullbio/sqlboiler/strmangle"`, + `"github.com/vattle/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil/qm"`, + `"github.com/vattle/sqlboiler/strmangle"`, }, } @@ -199,7 +199,7 @@ var defaultSingletonTestTemplateImports = map[string]imports{ `"bytes"`, }, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil"`, }, }, } @@ -220,8 +220,8 @@ var defaultTestMainImports = map[string]imports{ `"math/rand"`, }, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, - `"github.com/nullbio/sqlboiler/bdb/drivers"`, + `"github.com/vattle/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/bdb/drivers"`, `_ "github.com/lib/pq"`, `"github.com/spf13/viper"`, `"github.com/kat-co/vala"`, diff --git a/imports_test.go b/imports_test.go index 775aa86..1dec760 100644 --- a/imports_test.go +++ b/imports_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/nullbio/sqlboiler/bdb" + "github.com/vattle/sqlboiler/bdb" ) func TestImportsSort(t *testing.T) { @@ -61,7 +61,7 @@ func TestCombineTypeImports(t *testing.T) { `"fmt"`, }, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil"`, }, } @@ -72,7 +72,7 @@ func TestCombineTypeImports(t *testing.T) { `"time"`, }, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil"`, `"gopkg.in/nullbio/null.v4"`, }, } @@ -105,7 +105,7 @@ func TestCombineTypeImports(t *testing.T) { `"time"`, }, thirdParty: importList{ - `"github.com/nullbio/sqlboiler/boil"`, + `"github.com/vattle/sqlboiler/boil"`, `"gopkg.in/nullbio/null.v4"`, }, } @@ -122,11 +122,11 @@ func TestCombineImports(t *testing.T) { a := imports{ standard: importList{"fmt"}, - thirdParty: importList{"github.com/nullbio/sqlboiler", "gopkg.in/nullbio/null.v4"}, + thirdParty: importList{"github.com/vattle/sqlboiler", "gopkg.in/nullbio/null.v4"}, } b := imports{ standard: importList{"os"}, - thirdParty: importList{"github.com/nullbio/sqlboiler"}, + thirdParty: importList{"github.com/vattle/sqlboiler"}, } c := combineImports(a, b) @@ -134,8 +134,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/nullbio/sqlboiler" && c.thirdParty[1] != "gopkg.in/nullbio/null.v4" { - t.Errorf("Wanted: github.com/nullbio/sqlboiler, gopkg.in/nullbio/null.v4 got: %#v", c.thirdParty) + if c.thirdParty[0] != "github.com/vattle/sqlboiler" && c.thirdParty[1] != "gopkg.in/nullbio/null.v4" { + t.Errorf("Wanted: github.com/vattle/sqlboiler, gopkg.in/nullbio/null.v4 got: %#v", c.thirdParty) } } diff --git a/main.go b/main.go index 28917bd..e2dff75 100644 --- a/main.go +++ b/main.go @@ -50,7 +50,7 @@ func main() { Use: "sqlboiler [flags] ", Short: "SQL Boiler generates boilerplate structs and statements", Long: "SQL Boiler generates boilerplate structs and statements from template files.\n" + - `Complete documentation is available at http://github.com/nullbio/sqlboiler`, + `Complete documentation is available at http://github.com/vattle/sqlboiler`, Example: `sqlboiler -o models -p models postgres`, PreRunE: preRun, RunE: run, diff --git a/sqlboiler.go b/sqlboiler.go index 5f1d916..b1e1e67 100644 --- a/sqlboiler.go +++ b/sqlboiler.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - "github.com/nullbio/sqlboiler/bdb" - "github.com/nullbio/sqlboiler/bdb/drivers" + "github.com/vattle/sqlboiler/bdb" + "github.com/vattle/sqlboiler/bdb/drivers" "github.com/pkg/errors" ) diff --git a/sqlboiler_test.go b/sqlboiler_test.go index eed674a..ce78e3e 100644 --- a/sqlboiler_test.go +++ b/sqlboiler_test.go @@ -12,7 +12,7 @@ import ( "strconv" "testing" - "github.com/nullbio/sqlboiler/bdb" + "github.com/vattle/sqlboiler/bdb" ) var state *State diff --git a/templates.go b/templates.go index 6aa74d5..f100acf 100644 --- a/templates.go +++ b/templates.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - "github.com/nullbio/sqlboiler/bdb" - "github.com/nullbio/sqlboiler/strmangle" + "github.com/vattle/sqlboiler/bdb" + "github.com/vattle/sqlboiler/strmangle" ) // templateData for sqlboiler templates diff --git a/text_helpers.go b/text_helpers.go index 1ce030d..fa00011 100644 --- a/text_helpers.go +++ b/text_helpers.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/nullbio/sqlboiler/bdb" - "github.com/nullbio/sqlboiler/strmangle" + "github.com/vattle/sqlboiler/bdb" + "github.com/vattle/sqlboiler/strmangle" ) // RelationshipToOneTexts contains text that will be used by templates. diff --git a/text_helpers_test.go b/text_helpers_test.go index 76c695e..21c9057 100644 --- a/text_helpers_test.go +++ b/text_helpers_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/nullbio/sqlboiler/bdb" - "github.com/nullbio/sqlboiler/strmangle" + "github.com/vattle/sqlboiler/bdb" + "github.com/vattle/sqlboiler/strmangle" ) type fakeDB int