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

Generated test folder rename.

Browse source
This commit is contained in:
go-jet 2019-06-24 10:01:34 +02:00
parent a44bd85d32
commit f41e1a944f
12 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -15,4 +15,4 @@
.idea .idea
# Test files # Test files
.test_files .gentestdata

9
execution/execution.go
View file

@ -675,17 +675,20 @@ func (s *scanContext) columnIndex(tableName, columnName string) int {
return i return i
} }
name = strings.ToLower(snaker.CamelToSnake(tableName) + "." + snaker.CamelToSnake(columnName)) snakedTableName := snaker.CamelToSnake(tableName)
snakedColumnName := snaker.CamelToSnake(columnName)
name = strings.ToLower(snakedTableName + "." + snakedColumnName)
if i, ok := s.columnNameIndexMap[name]; ok { if i, ok := s.columnNameIndexMap[name]; ok {
return i return i
} }
name = strings.ToLower(tableName + "." + snaker.CamelToSnake(columnName)) name = strings.ToLower(tableName + "." + snakedColumnName)
if i, ok := s.columnNameIndexMap[name]; ok { if i, ok := s.columnNameIndexMap[name]; ok {
return i return i
} }
name = strings.ToLower(snaker.CamelToSnake(tableName) + "." + columnName) name = strings.ToLower(snakedTableName + "." + columnName)
if i, ok := s.columnNameIndexMap[name]; ok { if i, ok := s.columnNameIndexMap[name]; ok {
return i return i
} }

4
tests/all_types_test.go
View file

@ -3,8 +3,8 @@ package tests
import ( import (
"fmt" "fmt"
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
"github.com/google/uuid" "github.com/google/uuid"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"

6
tests/chinook_db_test.go
View file

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/chinook/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/chinook/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/table"
"gotest.tools/assert" "gotest.tools/assert"
"io/ioutil" "io/ioutil"
"testing" "testing"
@ -110,7 +110,7 @@ func TestJoinEverything(t *testing.T) {
fmt.Println("Artist count :", len(dest)) fmt.Println("Artist count :", len(dest))
assert.Equal(t, len(dest), 275) assert.Equal(t, len(dest), 275)
assertJson(t, "./data/joined_everything.json", dest) assertJson(t, "./testdata/joined_everything.json", dest)
} }
func TestUnionForQuotedNames(t *testing.T) { func TestUnionForQuotedNames(t *testing.T) {

4
tests/insert_test.go
View file

@ -2,8 +2,8 @@ package tests
import ( import (
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

2
tests/main_test.go
View file

@ -2,7 +2,7 @@ package tests
import ( import (
"database/sql" "database/sql"
"github.com/go-jet/jet/tests/.test_files/jetdb/dvds/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
"github.com/go-jet/jet/tests/dbconfig" "github.com/go-jet/jet/tests/dbconfig"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/pkg/profile" "github.com/pkg/profile"

4
tests/sample_test.go
View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
"github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/table" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

4
tests/scan_test.go
View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/dvds/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table"
"github.com/google/uuid" "github.com/google/uuid"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"

10
tests/select_test.go
View file

@ -4,11 +4,11 @@ import (
"fmt" "fmt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/dvds/enum" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/enum"
"github.com/go-jet/jet/tests/.test_files/jetdb/dvds/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table"
model2 "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/model" model2 "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

0
tests/data/joined_everything.json → tests/testdata/joined_everything.json vendored
View file

4
tests/update_test.go
View file

@ -3,8 +3,8 @@ package tests
import ( import (
"fmt" "fmt"
. "github.com/go-jet/jet" . "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model"
. "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/table" . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table"
"gotest.tools/assert" "gotest.tools/assert"
"testing" "testing"
) )

2
tests/util_test.go
View file

@ -2,7 +2,7 @@ package tests
import ( import (
"github.com/go-jet/jet" "github.com/go-jet/jet"
"github.com/go-jet/jet/tests/.test_files/jetdb/dvds/model" "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model"
"github.com/google/uuid" "github.com/google/uuid"
"gotest.tools/assert" "gotest.tools/assert"
"strings" "strings"