From d2e96ecfe6f0bb1abd009b2558fd5ada125d6f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Fri, 23 Aug 2024 18:23:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E6=9E=84=E4=BD=93?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api2sql/execute.go | 15 ++++++++------- api2sql/execute_test.go | 20 +++++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/api2sql/execute.go b/api2sql/execute.go index 98a7fd0..50dedf6 100644 --- a/api2sql/execute.go +++ b/api2sql/execute.go @@ -90,21 +90,22 @@ func (e *execute) List(ctx context.Context, inputParam *define.Api2SqlParam) (an st := wrapper.NewDynamic() for _, columnConfig := range inputParam.ColumnList { tag := fmt.Sprintf(`gorm:%v json:%v`, columnConfig.Column, columnConfig.Alias) + column := wrapper.String(columnConfig.Column).SnakeCaseToCamel() switch columnConfig.Type { case "int", "int8", "int16", "int32", "int64": - st.AddInt(columnConfig.Column, tag, "") + st.AddInt(column, tag, "") case "uint", "uint8", "uint16", "uint32", "uint64": - st.AddUint(columnConfig.Column, tag, "") + st.AddUint(column, tag, "") case "bool": - st.AddBool(columnConfig.Column, tag, "") + st.AddBool(column, tag, "") case "float": - st.AddBool(columnConfig.Column, tag, "") + st.AddBool(column, tag, "") case "string": - st.AddString(columnConfig.Column, tag, "") + st.AddString(column, tag, "") case "map": - st.AddMap(columnConfig.Column, tag, "") + st.AddMap(column, tag, "") case "slice": - st.AddSlice(columnConfig.Column, tag, "") + st.AddSlice(column, tag, "") } } val := st.ToStructDefaultSliceValue() diff --git a/api2sql/execute_test.go b/api2sql/execute_test.go index effbcbd..767857c 100644 --- a/api2sql/execute_test.go +++ b/api2sql/execute_test.go @@ -43,13 +43,19 @@ func Test_execute_Run(t *testing.T) { }) Exec.SetDatabaseClientManager(clientManager) res, err := Exec.List(context.Background(), &define.Api2SqlParam{ - DatabaseFlag: "TEST_DATABASE", - Table: "project", - ForceMaster: false, - InputSql: "", - TableSplitConfig: define.TableSplitConfig{}, - SqlType: consts.SqlTypeList, - ColumnList: nil, + DatabaseFlag: "TEST_DATABASE", + Table: "project", + ForceMaster: false, + InputSql: "", + TableSplitConfig: define.TableSplitConfig{}, + SqlType: consts.SqlTypeList, + ColumnList: []*define.ColumnConfig{ + &define.ColumnConfig{ + Column: "flag", + Alias: "project_flag", + Type: "string", + }, + }, Limit: 0, Offset: 0, ForceNoLimit: false,