Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/sub0zero/go-sqlbuilder into develop

Browse source
This commit is contained in:
zer0sub 2019-06-07 14:24:16 +02:00
commit e727fc3d4f
21 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/generator/main.go
View file

@ -3,7 +3,7 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/sub0zero/go-sqlbuilder/generator" "github.com/go-jet/jet/generator"
"os" "os"
) )

4
generator/generator.go
View file

@ -3,9 +3,9 @@ package generator
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/go-jet/jet/generator/metadata"
"github.com/go-jet/jet/generator/postgres-metadata"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/sub0zero/go-sqlbuilder/generator/metadata"
"github.com/sub0zero/go-sqlbuilder/generator/postgres-metadata"
"path" "path"
"path/filepath" "path/filepath"
) )

2
generator/postgres-metadata/enum_info.go
View file

@ -3,7 +3,7 @@ package postgres_metadata
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/sub0zero/go-sqlbuilder/generator/metadata" "github.com/go-jet/jet/generator/metadata"
) )
type EnumInfo struct { type EnumInfo struct {

2
generator/postgres-metadata/schema_info.go
View file

@ -3,7 +3,7 @@ package postgres_metadata
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/sub0zero/go-sqlbuilder/generator/metadata" "github.com/go-jet/jet/generator/metadata"
) )
type SchemaInfo struct { type SchemaInfo struct {

6
generator/templates.go
View file

@ -2,7 +2,7 @@ package generator
var autoGenWarningTemplate = ` var autoGenWarningTemplate = `
// //
// Code generated by sqlbuilder DO NOT EDIT. // Code generated by go-jet DO NOT EDIT.
// Generated at {{now}} // Generated at {{now}}
// //
// WARNING: Changes to this file may cause incorrect behavior and will be lost // WARNING: Changes to this file may cause incorrect behavior and will be lost
@ -23,7 +23,7 @@ var sqlBuilderTableTemplate = `
package table package table
import ( import (
"github.com/sub0zero/go-sqlbuilder/sqlbuilder" "github.com/go-jet/jet/sqlbuilder"
) )
type {{.GoStructName}} struct { type {{.GoStructName}} struct {
@ -122,7 +122,7 @@ func (e {{camelize $.Name}}) String() string {
` `
var enumTypeTemplate = `package enum var enumTypeTemplate = `package enum
import "github.com/sub0zero/go-sqlbuilder/sqlbuilder" import "github.com/go-jet/jet/sqlbuilder"
var {{camelize $.Name}} = &struct { var {{camelize $.Name}} = &struct {
{{- range $index, $element := .Values}} {{- range $index, $element := .Values}}

2
sqlbuilder/delete_statement.go
View file

@ -3,7 +3,7 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"errors" "errors"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution" "github.com/go-jet/jet/sqlbuilder/execution"
) )
type DeleteStatement interface { type DeleteStatement interface {

2
sqlbuilder/insert_statement.go
View file

@ -3,8 +3,8 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"errors" "errors"
"github.com/go-jet/jet/sqlbuilder/execution"
"github.com/serenize/snaker" "github.com/serenize/snaker"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution"
"reflect" "reflect"
"strings" "strings"
) )

2
sqlbuilder/lock_statement.go
View file

@ -2,8 +2,8 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"github.com/go-jet/jet/sqlbuilder/execution"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution"
) )
type lockMode string type lockMode string

2
sqlbuilder/select_statement.go
View file

@ -3,7 +3,7 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"errors" "errors"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution" "github.com/go-jet/jet/sqlbuilder/execution"
) )
type SelectStatement interface { type SelectStatement interface {

2
sqlbuilder/set_statement.go
View file

@ -3,7 +3,7 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"errors" "errors"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution" "github.com/go-jet/jet/sqlbuilder/execution"
) )
type SetStatement interface { type SetStatement interface {

2
sqlbuilder/statement.go
View file

@ -2,7 +2,7 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution" "github.com/go-jet/jet/sqlbuilder/execution"
"strconv" "strconv"
"strings" "strings"
) )

2
sqlbuilder/update_statement.go
View file

@ -3,7 +3,7 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"errors" "errors"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution" "github.com/go-jet/jet/sqlbuilder/execution"
) )
type UpdateStatement interface { type UpdateStatement interface {

2
sqlbuilder/utils.go
View file

@ -3,7 +3,7 @@ package sqlbuilder
import ( import (
"database/sql" "database/sql"
"errors" "errors"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder/execution" "github.com/go-jet/jet/sqlbuilder/execution"
"reflect" "reflect"
) )

6
tests/insert_test.go
View file

@ -3,9 +3,9 @@ package tests
import ( import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder" "github.com/go-jet/jet/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/model" "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/model"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/table" "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

2
tests/main_test.go
View file

@ -3,9 +3,9 @@ package tests
import ( import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/model"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/pkg/profile" "github.com/pkg/profile"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/model"
"gotest.tools/assert" "gotest.tools/assert"
"os" "os"
"reflect" "reflect"

6
tests/sample_test.go
View file

@ -3,9 +3,9 @@ package tests
import ( import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
. "github.com/sub0zero/go-sqlbuilder/sqlbuilder" . "github.com/go-jet/jet/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/model" "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/model"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/table" "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

6
tests/scan_test.go
View file

@ -2,10 +2,10 @@ package tests
import ( import (
"fmt" "fmt"
. "github.com/go-jet/jet/sqlbuilder"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/model"
. "github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/table"
"github.com/google/uuid" "github.com/google/uuid"
. "github.com/sub0zero/go-sqlbuilder/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/model"
. "github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

12
tests/select_test.go
View file

@ -3,12 +3,12 @@ package tests
import ( import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
. "github.com/sub0zero/go-sqlbuilder/sqlbuilder" . "github.com/go-jet/jet/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/enum" "github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/enum"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/model" "github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/model"
. "github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/table" . "github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/table"
model2 "github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/model" model2 "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/model"
. "github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/table" . "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

4
tests/test_util.go
View file

@ -1,9 +1,9 @@
package tests package tests
import ( import (
"github.com/go-jet/jet/sqlbuilder"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/model"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/sub0zero/go-sqlbuilder/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/dvds/model"
"gotest.tools/assert" "gotest.tools/assert"
"strings" "strings"
"testing" "testing"

6
tests/types_test.go
View file

@ -2,10 +2,10 @@ package tests
import ( import (
"fmt" "fmt"
. "github.com/go-jet/jet/sqlbuilder"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/model"
. "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/table"
"github.com/google/uuid" "github.com/google/uuid"
. "github.com/sub0zero/go-sqlbuilder/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/model"
. "github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

6
tests/update_test.go
View file

@ -2,9 +2,9 @@ package tests
import ( import (
"fmt" "fmt"
. "github.com/sub0zero/go-sqlbuilder/sqlbuilder" . "github.com/go-jet/jet/sqlbuilder"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/model" "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/model"
"github.com/sub0zero/go-sqlbuilder/tests/.test_files/dvd_rental/test_sample/table" "github.com/go-jet/jet/tests/.test_files/dvd_rental/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )