From f41e1a944f938eb7624e77c833c46f5e39ef23f4 Mon Sep 17 00:00:00 2001 From: go-jet Date: Mon, 24 Jun 2019 10:01:34 +0200 Subject: [PATCH] Generated test folder rename. --- .gitignore | 2 +- execution/execution.go | 9 ++++++--- tests/all_types_test.go | 4 ++-- tests/chinook_db_test.go | 6 +++--- tests/insert_test.go | 4 ++-- tests/main_test.go | 2 +- tests/sample_test.go | 4 ++-- tests/scan_test.go | 4 ++-- tests/select_test.go | 10 +++++----- tests/{data => testdata}/joined_everything.json | 0 tests/update_test.go | 4 ++-- tests/util_test.go | 2 +- 12 files changed, 27 insertions(+), 24 deletions(-) rename tests/{data => testdata}/joined_everything.json (100%) diff --git a/.gitignore b/.gitignore index e9df959..fdbae22 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ .idea # Test files -.test_files \ No newline at end of file +.gentestdata \ No newline at end of file diff --git a/execution/execution.go b/execution/execution.go index 0241dc8..ecde8d7 100644 --- a/execution/execution.go +++ b/execution/execution.go @@ -675,17 +675,20 @@ func (s *scanContext) columnIndex(tableName, columnName string) int { 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 { return i } - name = strings.ToLower(tableName + "." + snaker.CamelToSnake(columnName)) + name = strings.ToLower(tableName + "." + snakedColumnName) if i, ok := s.columnNameIndexMap[name]; ok { return i } - name = strings.ToLower(snaker.CamelToSnake(tableName) + "." + columnName) + name = strings.ToLower(snakedTableName + "." + columnName) if i, ok := s.columnNameIndexMap[name]; ok { return i } diff --git a/tests/all_types_test.go b/tests/all_types_test.go index 3342ade..7d3a361 100644 --- a/tests/all_types_test.go +++ b/tests/all_types_test.go @@ -3,8 +3,8 @@ package tests import ( "fmt" . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/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/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" "github.com/google/uuid" "gotest.tools/assert" "testing" diff --git a/tests/chinook_db_test.go b/tests/chinook_db_test.go index 524f20a..86fb40b 100644 --- a/tests/chinook_db_test.go +++ b/tests/chinook_db_test.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/jetdb/chinook/model" - . "github.com/go-jet/jet/tests/.test_files/jetdb/chinook/table" + "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/chinook/table" "gotest.tools/assert" "io/ioutil" "testing" @@ -110,7 +110,7 @@ func TestJoinEverything(t *testing.T) { fmt.Println("Artist count :", len(dest)) 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) { diff --git a/tests/insert_test.go b/tests/insert_test.go index 4d8ca5a..84d7d56 100644 --- a/tests/insert_test.go +++ b/tests/insert_test.go @@ -2,8 +2,8 @@ package tests import ( . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/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/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" "gotest.tools/assert" "testing" ) diff --git a/tests/main_test.go b/tests/main_test.go index b2f3cdd..6f5fb42 100644 --- a/tests/main_test.go +++ b/tests/main_test.go @@ -2,7 +2,7 @@ package tests import ( "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/lib/pq" "github.com/pkg/profile" diff --git a/tests/sample_test.go b/tests/sample_test.go index 96245fd..9264cd6 100644 --- a/tests/sample_test.go +++ b/tests/sample_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/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/model" + "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" "gotest.tools/assert" "testing" ) diff --git a/tests/scan_test.go b/tests/scan_test.go index 5445a95..7c0e36d 100644 --- a/tests/scan_test.go +++ b/tests/scan_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/model" - . "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/table" + "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table" "github.com/google/uuid" "gotest.tools/assert" "testing" diff --git a/tests/select_test.go b/tests/select_test.go index 83212d8..ab47b88 100644 --- a/tests/select_test.go +++ b/tests/select_test.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/davecgh/go-spew/spew" . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/enum" - "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/model" - . "github.com/go-jet/jet/tests/.test_files/jetdb/dvds/table" - model2 "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/model" - . "github.com/go-jet/jet/tests/.test_files/jetdb/test_sample/table" + "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/enum" + "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/dvds/table" + model2 "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" "gotest.tools/assert" "testing" ) diff --git a/tests/data/joined_everything.json b/tests/testdata/joined_everything.json similarity index 100% rename from tests/data/joined_everything.json rename to tests/testdata/joined_everything.json diff --git a/tests/update_test.go b/tests/update_test.go index be5d3a7..4bdffbd 100644 --- a/tests/update_test.go +++ b/tests/update_test.go @@ -3,8 +3,8 @@ package tests import ( "fmt" . "github.com/go-jet/jet" - "github.com/go-jet/jet/tests/.test_files/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/model" + . "github.com/go-jet/jet/tests/.gentestdata/jetdb/test_sample/table" "gotest.tools/assert" "testing" ) diff --git a/tests/util_test.go b/tests/util_test.go index 73ac6f5..0d23dde 100644 --- a/tests/util_test.go +++ b/tests/util_test.go @@ -2,7 +2,7 @@ package tests import ( "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" "gotest.tools/assert" "strings"