Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Order by column simplified.

Browse source
This commit is contained in:
sub0Zero 2019-03-15 21:55:43 +01:00 • committed by zer0sub
parent ba3cd37734
commit 8049b2ec01
4 changed files with 167 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sqlbuilder/execution/execution.go
View file

@ -6,6 +6,7 @@ import (
"fmt"
"github.com/serenize/snaker"
"reflect"
"strconv"
"strings"
"time"
)
@ -36,6 +37,7 @@ func Execute(db *sql.DB, query string, destinationPtr interface{}) error {
rowData := createScanValue(columnTypes)
scanContext := &scanContext{
columnNames: columnNames,
uniqueObjectsMap: make(map[string]interface{}),
}
@ -47,6 +49,8 @@ func Execute(db *sql.DB, query string, destinationPtr interface{}) error {
return err
}
scanContext.rowNum++
columnProcessed := make([]bool, len(columnTypes))
if destinationType.Elem().Kind() == reflect.Slice {
@ -70,6 +74,7 @@ func Execute(db *sql.DB, query string, destinationPtr interface{}) error {
}
type scanContext struct {
rowNum int
columnNames []string
uniqueObjectsMap map[string]interface{}
}
@ -107,13 +112,13 @@ func getGroupKey(scanContext *scanContext, row []interface{}, structType reflect
columnName := snaker.CamelToSnake(structName) + "." + snaker.CamelToSnake(fieldName)
//fmt.Println(fieldName)
rowIndex := getIndex(scanContext.columnNames, columnName)
index := getIndex(scanContext.columnNames, columnName)
if rowIndex < 0 {
if index < 0 {
continue
}
rowValue := reflect.ValueOf(row[rowIndex])
rowValue := reflect.ValueOf(row[index])
groupKey = groupKey + reflectValueToString(rowValue)
} else if !isDbBaseType(fieldType.Type) {
@ -161,7 +166,13 @@ func mapRowToSlice(scanContext *scanContext, groupKey string, columnProcessed []
structType := getSliceStructType(destinationPtr)
groupKey = groupKey + ":" + getGroupKey(scanContext, row, structType)
structGroupKey := getGroupKey(scanContext, row, structType)
if structGroupKey == "" {
structGroupKey = strconv.Itoa(scanContext.rowNum)
}
groupKey = groupKey + ":" + structGroupKey
objPtr, ok := scanContext.uniqueObjectsMap[groupKey]