@@ -37,17 +37,19 @@ type KtField struct {
3737}
3838
3939type KtStruct struct {
40- Table core.FQN
41- Name string
42- Fields []KtField
43- Comment string
40+ Table core.FQN
41+ Name string
42+ Fields []KtField
43+ JDBCParamBindings []KtField
44+ Comment string
4445}
4546
4647type KtQueryValue struct {
47- Emit bool
48- Name string
49- Struct * KtStruct
50- Typ ktType
48+ Emit bool
49+ Name string
50+ Struct * KtStruct
51+ Typ ktType
52+ JDBCParamBindCount int
5153}
5254
5355func (v KtQueryValue ) EmitStruct () bool {
@@ -101,9 +103,15 @@ func (v KtQueryValue) Params() string {
101103 }
102104 var out []string
103105 if v .Struct == nil {
104- out = append (out , jdbcSet (v .Typ , 1 , v .Name ))
106+ repeat := 1
107+ if v .JDBCParamBindCount > 0 {
108+ repeat = v .JDBCParamBindCount
109+ }
110+ for i := 1 ; i <= repeat ; i ++ {
111+ out = append (out , jdbcSet (v .Typ , i , v .Name ))
112+ }
105113 } else {
106- for i , f := range v .Struct .Fields {
114+ for i , f := range v .Struct .JDBCParamBindings {
107115 out = append (out , jdbcSet (f .Type , i + 1 , v .Name + "." + f .Name ))
108116 }
109117 }
@@ -595,21 +603,34 @@ func (r Result) ktInnerType(col core.Column, settings dinosql.CombinedSettings)
595603 }
596604}
597605
598- func (r Result ) ktColumnsToStruct (name string , columns []core.Column , settings dinosql.CombinedSettings ) * KtStruct {
606+ type goColumn struct {
607+ id int
608+ core.Column
609+ }
610+
611+ func (r Result ) ktColumnsToStruct (name string , columns []goColumn , settings dinosql.CombinedSettings ) * KtStruct {
599612 gs := KtStruct {
600613 Name : name ,
601614 }
602- seen := map [string ]int {}
615+ idSeen := map [int ]KtField {}
616+ nameSeen := map [string ]int {}
603617 for i , c := range columns {
604- fieldName := KtMemberName (ktColumnName (c , i ), settings )
605- if v := seen [c .Name ]; v > 0 {
618+ if binding , ok := idSeen [c .id ]; ok {
619+ gs .JDBCParamBindings = append (gs .JDBCParamBindings , binding )
620+ continue
621+ }
622+ fieldName := KtMemberName (ktColumnName (c .Column , i ), settings )
623+ if v := nameSeen [c .Name ]; v > 0 {
606624 fieldName = fmt .Sprintf ("%s_%d" , fieldName , v + 1 )
607625 }
608- gs . Fields = append ( gs . Fields , KtField {
626+ field := KtField {
609627 Name : fieldName ,
610- Type : r .ktType (c , settings ),
611- })
612- seen [c .Name ]++
628+ Type : r .ktType (c .Column , settings ),
629+ }
630+ gs .Fields = append (gs .Fields , field )
631+ gs .JDBCParamBindings = append (gs .JDBCParamBindings , field )
632+ nameSeen [c .Name ]++
633+ idSeen [c .id ] = field
613634 }
614635 return & gs
615636}
@@ -672,21 +693,26 @@ func (r Result) KtQueries(settings dinosql.CombinedSettings) []KtQuery {
672693 Comments : query .Comments ,
673694 }
674695
675- if len (query .Params ) == 1 {
696+ var cols []goColumn
697+ for _ , p := range query .Params {
698+ cols = append (cols , goColumn {
699+ id : p .Number ,
700+ Column : p .Column ,
701+ })
702+ }
703+ params := r .ktColumnsToStruct (gq .ClassName + "Params" , cols , settings )
704+ if len (params .Fields ) == 1 {
676705 p := query .Params [0 ]
677706 gq .Arg = KtQueryValue {
678- Name : ktParamName (p ),
679- Typ : r .ktType (p .Column , settings ),
680- }
681- } else if len (query .Params ) > 1 {
682- var cols []core.Column
683- for _ , p := range query .Params {
684- cols = append (cols , p .Column )
707+ Name : ktParamName (p ),
708+ Typ : r .ktType (p .Column , settings ),
709+ JDBCParamBindCount : len (params .JDBCParamBindings ),
685710 }
711+ } else if len (params .Fields ) > 1 {
686712 gq .Arg = KtQueryValue {
687713 Emit : true ,
688714 Name : "arg" ,
689- Struct : r . ktColumnsToStruct ( gq . ClassName + "Params" , cols , settings ) ,
715+ Struct : params ,
690716 }
691717 }
692718
@@ -722,7 +748,14 @@ func (r Result) KtQueries(settings dinosql.CombinedSettings) []KtQuery {
722748 }
723749
724750 if gs == nil {
725- gs = r .ktColumnsToStruct (gq .ClassName + "Row" , query .Columns , settings )
751+ var columns []goColumn
752+ for i , c := range query .Columns {
753+ columns = append (columns , goColumn {
754+ id : i ,
755+ Column : c ,
756+ })
757+ }
758+ gs = r .ktColumnsToStruct (gq .ClassName + "Row" , columns , settings )
726759 emit = true
727760 }
728761 gq .Ret = KtQueryValue {
0 commit comments