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

Package path refactor.

Browse source
This commit is contained in:
go-jet 2019-06-21 13:56:57 +02:00
parent 829736279b
commit 83d4c5ad03
72 changed files with 162 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/all_types_test.go
View file

@ -2,7 +2,7 @@ package tests
import (
"fmt"
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"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"
@ -11,7 +11,6 @@ import (
)
func TestAllTypesSelect(t *testing.T) {
dest := []model.AllTypes{}
err := AllTypes.SELECT(AllTypes.AllColumns).Query(db, &dest)

10
tests/chinook_db_test.go
View file

@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/chinook/model"
. "github.com/go-jet/jet/tests/.test_files/dvd_rental/chinook/table"
"gotest.tools/assert"
@ -254,14 +254,14 @@ func assertJson(t *testing.T, jsonFilePath string, data interface{}) {
}
func jsonPrint(v interface{}) {
json, _ := json.MarshalIndent(v, "", "\t")
fmt.Println(string(json))
jsonText, _ := json.MarshalIndent(v, "", "\t")
fmt.Println(string(jsonText))
}
func jsonSave(path string, v interface{}) {
json, _ := json.MarshalIndent(v, "", "\t")
jsonText, _ := json.MarshalIndent(v, "", "\t")
err := ioutil.WriteFile(path, json, 0644)
err := ioutil.WriteFile(path, jsonText, 0644)
if err != nil {
panic(err)

63
tests/init/init.go
View file

@ -2,6 +2,7 @@ package main
import (
"database/sql"
"fmt"
"github.com/go-jet/jet/generator"
"github.com/go-jet/jet/tests/dbconfig"
"io/ioutil"
@ -12,45 +13,35 @@ func main() {
if err != nil {
panic("Failed to connect to test db")
}
defer db.Close()
defer func() {
err := db.Close()
printOnError(err)
}()
testSampleSql, err := ioutil.ReadFile("./init/data/test_sample.sql")
schemaNames := []string{
"dvds",
"test_sample",
"chinook",
}
panicOnError(err)
for _, schemaName := range schemaNames {
testSampleSql, err := ioutil.ReadFile("./init/data/" + schemaName + ".sql")
_, err = db.Exec(string(testSampleSql))
panicOnError(err)
panicOnError(err)
_, err = db.Exec(string(testSampleSql))
dvdsSql, err := ioutil.ReadFile("./init/data/dvds.sql")
err = generator.Generate("./.test_files", generator.GeneratorData{
Host: dbconfig.Host,
Port: "5432",
User: dbconfig.User,
Password: dbconfig.Password,
DBName: dbconfig.DBName,
SchemaName: schemaName,
})
panicOnError(err)
_, err = db.Exec(string(dvdsSql))
panicOnError(err)
err = generator.Generate("./.test_files", generator.GeneratorData{
Host: dbconfig.Host,
Port: "5432",
User: dbconfig.User,
Password: dbconfig.Password,
DBName: dbconfig.DBName,
SchemaName: "dvds",
})
panicOnError(err)
err = generator.Generate("./.test_files", generator.GeneratorData{
Host: dbconfig.Host,
Port: "5432",
User: dbconfig.User,
Password: dbconfig.Password,
DBName: dbconfig.DBName,
SchemaName: "test_sample",
})
panicOnError(err)
panicOnError(err)
}
}
func panicOnError(err error) {
@ -58,3 +49,9 @@ func panicOnError(err error) {
panic(err)
}
}
func printOnError(err error) {
if err != nil {
fmt.Println(err.Error())
}
}

2
tests/insert_test.go
View file

@ -1,7 +1,7 @@
package tests
import (
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"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"
"gotest.tools/assert"

2
tests/sample_test.go
View file

@ -3,7 +3,7 @@ package tests
import (
"fmt"
"github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"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"
"gotest.tools/assert"

2
tests/scan_test.go
View file

@ -3,7 +3,7 @@ package tests
import (
"fmt"
"github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"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"

19
tests/select_test.go
View file

@ -3,7 +3,7 @@ package tests
import (
"fmt"
"github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/enum"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/model"
. "github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/table"
@ -1129,7 +1129,9 @@ LOCK TABLE dvds.address IN`
assert.NilError(t, err)
tx.Rollback()
err = tx.Rollback()
assert.NilError(t, err)
}
for _, lockMode := range testData {
@ -1143,7 +1145,9 @@ LOCK TABLE dvds.address IN`
assert.NilError(t, err)
tx.Rollback()
err = tx.Rollback()
assert.NilError(t, err)
}
}
@ -1178,7 +1182,8 @@ FOR`
rowsAffected, _ := res.RowsAffected()
assert.Equal(t, rowsAffected, int64(3))
tx.Rollback()
err = tx.Rollback()
assert.NilError(t, err)
}
for lockType, lockTypeStr := range getRowLockTestData() {
@ -1193,7 +1198,8 @@ FOR`
rowsAffected, _ := res.RowsAffected()
assert.Equal(t, rowsAffected, int64(3))
tx.Rollback()
err = tx.Rollback()
assert.NilError(t, err)
}
for lockType, lockTypeStr := range getRowLockTestData() {
@ -1208,6 +1214,7 @@ FOR`
rowsAffected, _ := res.RowsAffected()
assert.Equal(t, rowsAffected, int64(3))
tx.Rollback()
err = tx.Rollback()
assert.NilError(t, err)
}
}

2
tests/update_test.go
View file

@ -2,7 +2,7 @@ package tests
import (
"fmt"
. "github.com/go-jet/jet/sqlbuilder"
. "github.com/go-jet/jet"
"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"
"gotest.tools/assert"

34
tests/test_util.go → tests/util_test.go
View file

@ -1,7 +1,7 @@
package tests
import (
"github.com/go-jet/jet/sqlbuilder"
"github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/dvd_rental/dvds/model"
"github.com/google/uuid"
"gotest.tools/assert"
@ -10,7 +10,7 @@ import (
"time"
)
func assertStatementSql(t *testing.T, query sqlbuilder.Statement, expectedQuery string, expectedArgs ...interface{}) {
func assertStatementSql(t *testing.T, query jet.Statement, expectedQuery string, expectedArgs ...interface{}) {
_, args, err := query.Sql()
assert.NilError(t, err)
//assert.Equal(t, queryStr, expectedQuery)
@ -22,7 +22,7 @@ func assertStatementSql(t *testing.T, query sqlbuilder.Statement, expectedQuery
assert.Equal(t, debuqSql, expectedQuery)
}
func assertExec(t *testing.T, stmt sqlbuilder.Statement, rowsAffected int64) {
func assertExec(t *testing.T, stmt jet.Statement, rowsAffected int64) {
res, err := stmt.Exec(db)
assert.NilError(t, err)
@ -31,10 +31,10 @@ func assertExec(t *testing.T, stmt sqlbuilder.Statement, rowsAffected int64) {
assert.Equal(t, rows, rowsAffected)
}
func assertExecErr(t *testing.T, stmt sqlbuilder.Statement, errorStr string) {
func assertExecErr(t *testing.T, stmt jet.Statement, errorStr string) {
_, err := stmt.Exec(db)
assert.Equal(t, err.Error(), errorStr)
assert.Error(t, err, errorStr)
}
func boolPtr(b bool) *bool {
return &b
@ -68,29 +68,29 @@ func float64Ptr(f float64) *float64 {
}
func uuidPtr(u string) *uuid.UUID {
uuid := uuid.MustParse(u)
newUUID := uuid.MustParse(u)
return &uuid
return &newUUID
}
func timeWithoutTimeZone(t string) *time.Time {
time, err := time.Parse("15:04:05", t)
newTime, err := time.Parse("15:04:05", t)
if err != nil {
panic(err)
}
return &time
return &newTime
}
func timeWithTimeZone(t string) *time.Time {
time, err := time.Parse("15:04:05 -0700", t)
newTimez, err := time.Parse("15:04:05 -0700", t)
if err != nil {
panic(err)
}
return &time
return &newTimez
}
func timestampWithoutTimeZone(t string, precision int) *time.Time {
@ -101,13 +101,13 @@ func timestampWithoutTimeZone(t string, precision int) *time.Time {
precisionStr = "." + strings.Repeat("9", precision)
}
time, err := time.Parse("2006-01-02 15:04:05"+precisionStr+" +0000", t+" +0000")
newTime, err := time.Parse("2006-01-02 15:04:05"+precisionStr+" +0000", t+" +0000")
if err != nil {
panic(err)
}
return &time
return &newTime
}
func timestampWithTimeZone(t string, precision int) *time.Time {
@ -118,17 +118,13 @@ func timestampWithTimeZone(t string, precision int) *time.Time {
precisionStr = "." + strings.Repeat("9", precision)
}
time, err := time.Parse("2006-01-02 15:04:05"+precisionStr+" -0700 MST", t)
newTime, err := time.Parse("2006-01-02 15:04:05"+precisionStr+" -0700 MST", t)
if err != nil {
panic(err)
}
return &time
}
func M3(a, b, c interface{}) []interface{} {
return []interface{}{a, b, c}
return &newTime
}
var customer0 = model.Customer{