From c4dd631a4944985d5210199795c82cc953e4661e Mon Sep 17 00:00:00 2001 From: r1v3r Date: Thu, 27 Jul 2023 17:07:26 +0800 Subject: [PATCH] fix: fix unit_test join pk error (#934) * fix: fix unit_test join pk error * tests: update unit test --- internal/template/method.go | 2 +- tests/.expect/dal_2/query/banks.gen_test.go | 2 +- tests/.expect/dal_2/query/credit_cards.gen_test.go | 2 +- tests/.expect/dal_2/query/customers.gen_test.go | 2 +- tests/.expect/dal_2/query/people.gen_test.go | 2 +- tests/.expect/dal_2/query/users.gen_test.go | 2 +- tests/.expect/dal_3/query/banks.gen_test.go | 2 +- tests/.expect/dal_3/query/credit_cards.gen_test.go | 2 +- tests/.expect/dal_3/query/customers.gen_test.go | 2 +- tests/.expect/dal_3/query/people.gen_test.go | 2 +- tests/.expect/dal_3/query/users.gen_test.go | 2 +- tests/.expect/dal_4/query/banks.gen_test.go | 2 +- tests/.expect/dal_4/query/credit_cards.gen_test.go | 2 +- tests/.expect/dal_4/query/customers.gen_test.go | 2 +- tests/.expect/dal_4/query/people.gen_test.go | 2 +- tests/.expect/dal_4/query/users.gen_test.go | 2 +- tests/.expect/dal_5/query/users.gen_test.go | 2 +- tests/.expect/dal_6/query/users.gen_test.go | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/template/method.go b/internal/template/method.go index bb02af52..5d2eda59 100644 --- a/internal/template/method.go +++ b/internal/template/method.go @@ -374,7 +374,7 @@ func Test_{{.QueryStructName}}Query(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_2/query/banks.gen_test.go b/tests/.expect/dal_2/query/banks.gen_test.go index b8e284c2..9968b01e 100644 --- a/tests/.expect/dal_2/query/banks.gen_test.go +++ b/tests/.expect/dal_2/query/banks.gen_test.go @@ -126,7 +126,7 @@ func Test_bankQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_2/query/credit_cards.gen_test.go b/tests/.expect/dal_2/query/credit_cards.gen_test.go index bfda562b..5f26f1df 100644 --- a/tests/.expect/dal_2/query/credit_cards.gen_test.go +++ b/tests/.expect/dal_2/query/credit_cards.gen_test.go @@ -126,7 +126,7 @@ func Test_creditCardQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_2/query/customers.gen_test.go b/tests/.expect/dal_2/query/customers.gen_test.go index 65286ea2..0ff28c33 100644 --- a/tests/.expect/dal_2/query/customers.gen_test.go +++ b/tests/.expect/dal_2/query/customers.gen_test.go @@ -126,7 +126,7 @@ func Test_customerQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_2/query/people.gen_test.go b/tests/.expect/dal_2/query/people.gen_test.go index 9939662e..3ac19e9f 100644 --- a/tests/.expect/dal_2/query/people.gen_test.go +++ b/tests/.expect/dal_2/query/people.gen_test.go @@ -126,7 +126,7 @@ func Test_personQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_2/query/users.gen_test.go b/tests/.expect/dal_2/query/users.gen_test.go index 0733319f..50a98d19 100644 --- a/tests/.expect/dal_2/query/users.gen_test.go +++ b/tests/.expect/dal_2/query/users.gen_test.go @@ -126,7 +126,7 @@ func Test_userQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_3/query/banks.gen_test.go b/tests/.expect/dal_3/query/banks.gen_test.go index 204e6c71..138e0e6f 100644 --- a/tests/.expect/dal_3/query/banks.gen_test.go +++ b/tests/.expect/dal_3/query/banks.gen_test.go @@ -126,7 +126,7 @@ func Test_bankQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_3/query/credit_cards.gen_test.go b/tests/.expect/dal_3/query/credit_cards.gen_test.go index 7947a4c1..b643a873 100644 --- a/tests/.expect/dal_3/query/credit_cards.gen_test.go +++ b/tests/.expect/dal_3/query/credit_cards.gen_test.go @@ -126,7 +126,7 @@ func Test_creditCardQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_3/query/customers.gen_test.go b/tests/.expect/dal_3/query/customers.gen_test.go index 43c65128..537bb440 100644 --- a/tests/.expect/dal_3/query/customers.gen_test.go +++ b/tests/.expect/dal_3/query/customers.gen_test.go @@ -126,7 +126,7 @@ func Test_customerQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_3/query/people.gen_test.go b/tests/.expect/dal_3/query/people.gen_test.go index e8dda2e3..20a6823d 100644 --- a/tests/.expect/dal_3/query/people.gen_test.go +++ b/tests/.expect/dal_3/query/people.gen_test.go @@ -126,7 +126,7 @@ func Test_personQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_3/query/users.gen_test.go b/tests/.expect/dal_3/query/users.gen_test.go index eea34730..e1868b4a 100644 --- a/tests/.expect/dal_3/query/users.gen_test.go +++ b/tests/.expect/dal_3/query/users.gen_test.go @@ -126,7 +126,7 @@ func Test_userQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_4/query/banks.gen_test.go b/tests/.expect/dal_4/query/banks.gen_test.go index e7aee2e2..a7c0dc74 100644 --- a/tests/.expect/dal_4/query/banks.gen_test.go +++ b/tests/.expect/dal_4/query/banks.gen_test.go @@ -126,7 +126,7 @@ func Test_bankQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_4/query/credit_cards.gen_test.go b/tests/.expect/dal_4/query/credit_cards.gen_test.go index c5ce2519..ee035cd6 100644 --- a/tests/.expect/dal_4/query/credit_cards.gen_test.go +++ b/tests/.expect/dal_4/query/credit_cards.gen_test.go @@ -126,7 +126,7 @@ func Test_creditCardQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_4/query/customers.gen_test.go b/tests/.expect/dal_4/query/customers.gen_test.go index 04b85e28..d6865c79 100644 --- a/tests/.expect/dal_4/query/customers.gen_test.go +++ b/tests/.expect/dal_4/query/customers.gen_test.go @@ -126,7 +126,7 @@ func Test_customerQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_4/query/people.gen_test.go b/tests/.expect/dal_4/query/people.gen_test.go index 6ebb566a..d0da115b 100644 --- a/tests/.expect/dal_4/query/people.gen_test.go +++ b/tests/.expect/dal_4/query/people.gen_test.go @@ -126,7 +126,7 @@ func Test_personQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_4/query/users.gen_test.go b/tests/.expect/dal_4/query/users.gen_test.go index 2b533f99..8ac43965 100644 --- a/tests/.expect/dal_4/query/users.gen_test.go +++ b/tests/.expect/dal_4/query/users.gen_test.go @@ -128,7 +128,7 @@ func Test_userQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_5/query/users.gen_test.go b/tests/.expect/dal_5/query/users.gen_test.go index 6906dad8..e8535867 100644 --- a/tests/.expect/dal_5/query/users.gen_test.go +++ b/tests/.expect/dal_5/query/users.gen_test.go @@ -126,7 +126,7 @@ func Test_userQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil { diff --git a/tests/.expect/dal_6/query/users.gen_test.go b/tests/.expect/dal_6/query/users.gen_test.go index 0a15043b..fdf49efa 100644 --- a/tests/.expect/dal_6/query/users.gen_test.go +++ b/tests/.expect/dal_6/query/users.gen_test.go @@ -126,7 +126,7 @@ func Test_userQuery(t *testing.T) { } var _a _another - var _aPK = field.NewString(_a.TableName(), clause.PrimaryKey) + var _aPK = field.NewString(_a.TableName(), "id") err = _do.Join(&_a, primaryKey.EqCol(_aPK)).Scan(map[string]interface{}{}) if err != nil {