fix bugs

Author: folospace

orm/query_get.go

@@ -196,6 +196,7 @@ func (m Query[T]) scanRows(dest interface{}, rows *sql.Rows) error {
         case reflect.Slice:
             switch ele.Elem().Kind() {
             case reflect.Struct:
+                keyAddr := reflect.New(reflectMap.Key()).Interface()
                 structAddr := reflect.New(ele.Elem()).Interface()
                 structAddrMap, err := getStructFieldAddrMap(structAddr)
                 if err != nil {
@@ -210,6 +211,7 @@ func (m Query[T]) scanRows(dest interface{}, rows *sql.Rows) error {
                         basePtrs[k] = &temp
                     }
                 }
+                basePtrs[0] = keyAddr
                 gerr = m.scanValues(basePtrs, rowColumns, rows, func() {
                     index := reflect.ValueOf(basePtrs[0]).Elem()
                     tempSlice := newVal.MapIndex(index)

orm_select_test.go

@@ -2,19 +2,69 @@ package main
 
 import (
     "database/sql"
+    "fmt"
     "github.com/folospace/go-mysql-orm/orm"
     _ "github.com/go-sql-driver/mysql"
     "testing"
+    "time"
 )
 
 var tdb, _ = sql.Open("mysql", "rfamro@tcp(mysql-rfam-public.ebi.ac.uk:4497)/Rfam?parseTime=true&charset=utf8mb4&loc=Asia%2FShanghai")
 
+var FamilyTable2 = orm.NewQuery(Family2{}, tdb)
+
+type Family2 struct {
+    RfamAcc            string    `json:"rfam_acc" orm:"rfam_acc,varchar(7),primary,unique"`
+    RfamId             string    `json:"rfam_id" orm:"rfam_id,varchar(40),index"`
+    AutoWiki           uint      `json:"auto_wiki" orm:"auto_wiki,int(10) unsigned,index"`
+    Description        *string   `json:"description" orm:"description,varchar(75),null" default:"NULL"`
+    Author             *string   `json:"author" orm:"author,tinytext,null"`
+    SeedSource         *string   `json:"seed_source" orm:"seed_source,tinytext,null"`
+    GatheringCutoff    *float64  `json:"gathering_cutoff" orm:"gathering_cutoff,double(5,2),null" default:"NULL"`
+    TrustedCutoff      *float64  `json:"trusted_cutoff" orm:"trusted_cutoff,double(5,2),null" default:"NULL"`
+    NoiseCutoff        *float64  `json:"noise_cutoff" orm:"noise_cutoff,double(5,2),null" default:"NULL"`
+    Comment            *string   `json:"comment" orm:"comment,longtext,null"`
+    PreviousId         *string   `json:"previous_id" orm:"previous_id,tinytext,null"`
+    Cmbuild            *string   `json:"cmbuild" orm:"cmbuild,tinytext,null"`
+    Cmcalibrate        *string   `json:"cmcalibrate" orm:"cmcalibrate,tinytext,null"`
+    Cmsearch           *string   `json:"cmsearch" orm:"cmsearch,tinytext,null"`
+    NumSeed            *int64    `json:"num_seed" orm:"num_seed,bigint(20),null" default:"NULL"`
+    NumFull            *int64    `json:"num_full" orm:"num_full,bigint(20),null" default:"NULL"`
+    NumGenomeSeq       *int64    `json:"num_genome_seq" orm:"num_genome_seq,bigint(20),null" default:"NULL"`
+    NumRefseq          *int64    `json:"num_refseq" orm:"num_refseq,bigint(20),null" default:"NULL"`
+    Type               *string   `json:"type" orm:"type,varchar(50),null" default:"NULL"`
+    StructureSource    *string   `json:"structure_source" orm:"structure_source,tinytext,null"`
+    NumberOfSpecies    *int64    `json:"number_of_species" orm:"number_of_species,bigint(20),null" default:"NULL"`
+    Number3dStructures *int      `json:"number_3d_structures" orm:"number_3d_structures,int(11),null" default:"NULL"`
+    NumPseudonokts     *int      `json:"num_pseudonokts" orm:"num_pseudonokts,int(11),null" default:"NULL"`
+    TaxSeed            *string   `json:"tax_seed" orm:"tax_seed,mediumtext,null"`
+    EcmliLambda        *float64  `json:"ecmli_lambda" orm:"ecmli_lambda,double(10,5),null" default:"NULL"`
+    EcmliMu            *float64  `json:"ecmli_mu" orm:"ecmli_mu,double(10,5),null" default:"NULL"`
+    EcmliCalDb         *int      `json:"ecmli_cal_db" orm:"ecmli_cal_db,mediumint(9),null" default:"0"`
+    EcmliCalHits       *int      `json:"ecmli_cal_hits" orm:"ecmli_cal_hits,mediumint(9),null" default:"0"`
+    Maxl               *int      `json:"maxl" orm:"maxl,mediumint(9),null" default:"0"`
+    Clen               *int      `json:"clen" orm:"clen,mediumint(9),null" default:"0"`
+    MatchPairNode      *int8     `json:"match_pair_node" orm:"match_pair_node,tinyint(1),null" default:"0"`
+    HmmTau             *float64  `json:"hmm_tau" orm:"hmm_tau,double(10,5),null" default:"NULL"`
+    HmmLambda          *float64  `json:"hmm_lambda" orm:"hmm_lambda,double(10,5),null" default:"NULL"`
+    Created            time.Time `json:"created" orm:"created,datetime"`
+    Updated            time.Time `json:"updated" orm:"updated,timestamp" default:"CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"`
+}
+
+func (Family2) TableName() string {
+    return "family"
+}
+
+func (Family2) DatabaseName() string {
+    return "Rfam"
+}
+
 func TestSelect(t *testing.T) {
     t.Run("query_raw", func(t *testing.T) {
 
-        var data map[string][]string
-        query := orm.NewQueryRaw("family", tdb).Select("type", "author").Limit(5).GetTo(&data)
-        t.Log(data)
+        var data map[string][]Family
+        query := FamilyTable2.Select("type", FamilyTable2.AllCols()).Limit(5).GetTo(&data)
+        t.Log(fmt.Sprintf("%+v", data))
         t.Log(query.Sql())
         t.Log(query.Error())
     })