@ -6,87 +6,85 @@ package xorm
import ( import (
"database/sql" "database/sql"
"fmt"
"reflect" "reflect"
"strconv"
"time" "time"
"github.com/go-xorm/core" "github.com/go-xorm/core"
) )
func ( session * Session ) query ( sqlStr string , paramStr ... interface { } ) ( [ ] map [ string ] [ ] byte , error ) { func ( session * Session ) queryPreprocess ( sqlStr * string , paramStr ... interface { } ) {
session . queryPreprocess ( & sqlStr , paramStr ... ) for _ , filter := range session . engine . dialect . Filters ( ) {
* sqlStr = filter . Do ( * sqlStr , session . engine . dialect , session . statement . RefTable )
if session . isAutoCommit {
return session . innerQuery2 ( sqlStr , paramStr ... )
}
return session . txQuery ( session . tx , sqlStr , paramStr ... )
} }
func ( session * Session ) txQuery ( tx * core . Tx , sqlStr string , params ... interface { } ) ( [ ] map [ string ] [ ] byte , error ) { session . lastSQL = * sqlStr
rows , err := tx . Query ( sqlStr , params ... ) session . lastSQLArgs = paramStr
if err != nil {
return nil , err
} }
defer rows . Close ( )
return rows2maps ( rows ) func ( session * Session ) queryRows ( sqlStr string , args ... interface { } ) ( * core . Rows , error ) {
} defer session . resetStatement ( )
func ( session * Session ) innerQuery ( sqlStr string , params ... interface { } ) ( * core . Stmt , * core . Rows , error ) { session . queryPreprocess ( & sqlStr , args ... )
var callback func ( ) ( * core . Stmt , * core . Rows , error )
if session . prepareStmt { if session . engine . showSQL {
callback = func ( ) ( * core . Stmt , * core . Rows , error ) { if session . engine . showExecTime {
stmt , err := session . doPrepare ( sqlStr ) b4ExecTime := time . Now ( )
if err != nil { defer func ( ) {
return nil , nil , err execDuration := time . Since ( b4ExecTime )
} if len ( args ) > 0 {
rows , err := stmt . Query ( params ... ) session . engine . logger . Infof ( "[SQL] %s %#v - took: %v" , sqlStr , args , execDuration )
if err != nil { } else {
return nil , nil , err session . engine . logger . Infof ( "[SQL] %s - took: %v" , sqlStr , execDuration )
}
return stmt , rows , nil
} }
} ( )
} else { } else {
callback = func ( ) ( * core . Stmt , * core . Rows , error ) { if len ( args ) > 0 {
rows , err := session . DB ( ) . Query ( sqlStr , params ... ) session . engine . logger . Infof ( "[SQL] %v %#v" , sqlStr , args )
if err != nil { } else {
return nil , nil , err session . engine . logger . Infof ( "[SQL] %v" , sqlStr )
} }
return nil , rows , err
} }
} }
stmt , rows , err := session . engine . logSQLQueryTime ( sqlStr , params , callback )
if session . isAutoCommit {
if session . prepareStmt {
// don't clear stmt since session will cache them
stmt , err := session . doPrepare ( sqlStr )
if err != nil { if err != nil {
return nil , nil , err return nil , err
}
rows , err := stmt . Query ( args ... )
if err != nil {
return nil , err
} }
return stmt , rows , nil return rows , nil
} }
func rows2maps ( rows * core . Rows ) ( resultsSlice [ ] map [ string ] [ ] byte , err error ) { rows , err := session . DB ( ) . Query ( sqlStr , args ... )
fields , err := rows . Columns ( )
if err != nil { if err != nil {
return nil , err return nil , err
} }
for rows . Next ( ) { return rows , nil
result , err := row2map ( rows , fields ) }
rows , err := session . tx . Query ( sqlStr , args ... )
if err != nil { if err != nil {
return nil , err return nil , err
} }
resultsSlice = append ( resultsSlice , result ) return rows , nil
} }
return resultsSlice , nil func ( session * Session ) queryRow ( sqlStr string , args ... interface { } ) * core . Row {
return core . NewRow ( session . queryRows ( sqlStr , args ... ) )
} }
func value2Bytes ( rawValue * reflect . Value ) ( data [ ] byte , err error ) { func value2Bytes ( rawValue * reflect . Value ) ( [ ] byte , error ) {
var str string str , err := value2String ( rawValue )
str , err = reflect2value ( rawValue )
if err != nil { if err != nil {
return return nil , err
} }
data = [ ] byte ( str ) return [ ] byte ( str ) , nil
return
} }
func row2map ( rows * core . Rows , fields [ ] string ) ( resultsMap map [ string ] [ ] byte , err error ) { func row2map ( rows * core . Rows , fields [ ] string ) ( resultsMap map [ string ] [ ] byte , err error ) {
@ -104,7 +102,7 @@ func row2map(rows *core.Rows, fields []string) (resultsMap map[string][]byte, er
rawValue := reflect . Indirect ( reflect . ValueOf ( scanResultContainers [ ii ] ) ) rawValue := reflect . Indirect ( reflect . ValueOf ( scanResultContainers [ ii ] ) )
//if row is null then ignore
//if row is null then ignore
if rawValue . Interface ( ) == nil { if rawValue . Interface ( ) == nil {
//fmt.Println("ignore ...", key, rawValue)
result [ key ] = [ ] byte { }
continue continue
} }
@ -117,34 +115,13 @@ func row2map(rows *core.Rows, fields []string) (resultsMap map[string][]byte, er
return result , nil return result , nil
} }
func ( session * Session ) innerQuery2 ( sqlStr string , params ... interface { } ) ( [ ] map [ string ] [ ] byte , error ) { func rows2maps ( rows * core . Rows ) ( resultsSlice [ ] map [ string ] [ ] byte , err error ) {
_ , rows , err := session . innerQuery ( sqlStr , params ... )
if rows != nil {
defer rows . Close ( )
}
if err != nil {
return nil , err
}
return rows2maps ( rows )
}
// Query runs a raw sql and return records as []map[string][]byte
func ( session * Session ) Query ( sqlStr string , paramStr ... interface { } ) ( [ ] map [ string ] [ ] byte , error ) {
defer session . resetStatement ( )
if session . isAutoClose {
defer session . Close ( )
}
return session . query ( sqlStr , paramStr ... )
}
func rows2Strings ( rows * core . Rows ) ( resultsSlice [ ] map [ string ] string , err error ) {
fields , err := rows . Columns ( ) fields , err := rows . Columns ( )
if err != nil { if err != nil {
return nil , err return nil , err
} }
for rows . Next ( ) { for rows . Next ( ) {
result , err := row2mapStr ( rows , fields ) result , err := row2map ( rows , fields )
if err != nil { if err != nil {
return nil , err return nil , err
} }
@ -154,122 +131,45 @@ func rows2Strings(rows *core.Rows) (resultsSlice []map[string]string, err error)
return resultsSlice , nil return resultsSlice , nil
} }
func reflect2value ( rawValue * reflect . Value ) ( str string , err error ) { func ( session * Session ) queryBytes ( sqlStr string , args ... interface { } ) ( [ ] map [ string ] [ ] byte , error ) {
aa := reflect . TypeOf ( ( * rawValue ) . Interface ( ) ) rows , err := session . queryRows ( sqlStr , args ... )
vv := reflect . ValueOf ( ( * rawValue ) . Interface ( ) )
switch aa . Kind ( ) {
case reflect . Int , reflect . Int8 , reflect . Int16 , reflect . Int32 , reflect . Int64 :
str = strconv . FormatInt ( vv . Int ( ) , 10 )
case reflect . Uint , reflect . Uint8 , reflect . Uint16 , reflect . Uint32 , reflect . Uint64 :
str = strconv . FormatUint ( vv . Uint ( ) , 10 )
case reflect . Float32 , reflect . Float64 :
str = strconv . FormatFloat ( vv . Float ( ) , 'f' , - 1 , 64 )
case reflect . String :
str = vv . String ( )
case reflect . Array , reflect . Slice :
switch aa . Elem ( ) . Kind ( ) {
case reflect . Uint8 :
data := rawValue . Interface ( ) . ( [ ] byte )
str = string ( data )
default :
err = fmt . Errorf ( "Unsupported struct type %v" , vv . Type ( ) . Name ( ) )
}
// time type
case reflect . Struct :
if aa . ConvertibleTo ( core . TimeType ) {
str = vv . Convert ( core . TimeType ) . Interface ( ) . ( time . Time ) . Format ( time . RFC3339Nano )
} else {
err = fmt . Errorf ( "Unsupported struct type %v" , vv . Type ( ) . Name ( ) )
}
case reflect . Bool :
str = strconv . FormatBool ( vv . Bool ( ) )
case reflect . Complex128 , reflect . Complex64 :
str = fmt . Sprintf ( "%v" , vv . Complex ( ) )
/ * TODO : unsupported types below
case reflect . Map :
case reflect . Ptr :
case reflect . Uintptr :
case reflect . UnsafePointer :
case reflect . Chan , reflect . Func , reflect . Interface :
* /
default :
err = fmt . Errorf ( "Unsupported struct type %v" , vv . Type ( ) . Name ( ) )
}
return
}
func value2String ( rawValue * reflect . Value ) ( data string , err error ) {
data , err = reflect2value ( rawValue )
if err != nil { if err != nil {
return
}
return
}
func row2mapStr ( rows * core . Rows , fields [ ] string ) ( resultsMap map [ string ] string , err error ) {
result := make ( map [ string ] string )
scanResultContainers := make ( [ ] interface { } , len ( fields ) )
for i := 0 ; i < len ( fields ) ; i ++ {
var scanResultContainer interface { }
scanResultContainers [ i ] = & scanResultContainer
}
if err := rows . Scan ( scanResultContainers ... ) ; err != nil {
return nil , err return nil , err
} }
defer rows . Close ( )
for ii , key := range fields { return rows2maps ( rows )
rawValue := reflect . Indirect ( reflect . ValueOf ( scanResultContainers [ ii ] ) )
//if row is null then ignore
if rawValue . Interface ( ) == nil {
//fmt.Println("ignore ...", key, rawValue)
continue
} }
if data , err := value2String ( & rawValue ) ; err == nil { func ( session * Session ) exec ( sqlStr string , args ... interface { } ) ( sql . Result , error ) {
result [ key ] = data defer session . resetStatement ( )
} else {
return nil , err // !nashtsai! REVIEW, should return err or just error log?
}
}
return result , nil
}
func txQuery2 ( tx * core . Tx , sqlStr string , params ... interface { } ) ( [ ] map [ string ] string , error ) { session . queryPreprocess ( & sqlStr , args ... )
rows , err := tx . Query ( sqlStr , params ... )
if err != nil {
return nil , err
}
defer rows . Close ( )
return rows2Strings ( rows ) if session . engine . showSQL {
if session . engine . showExecTime {
b4ExecTime := time . Now ( )
defer func ( ) {
execDuration := time . Since ( b4ExecTime )
if len ( args ) > 0 {
session . engine . logger . Infof ( "[SQL] %s %#v - took: %v" , sqlStr , args , execDuration )
} else {
session . engine . logger . Infof ( "[SQL] %s - took: %v" , sqlStr , execDuration )
} }
} ( )
func query2 ( db * core . DB , sqlStr string , params ... interface { } ) ( [ ] map [ string ] string , error ) { } else {
rows , err := db . Query ( sqlStr , params ... ) if len ( args ) > 0 {
if err != nil { session . engine . logger . Infof ( "[SQL] %v %#v" , sqlStr , args )
return nil , err } else {
session . engine . logger . Infof ( "[SQL] %v" , sqlStr )
} }
defer rows . Close ( )
return rows2Strings ( rows )
} }
// QueryString runs a raw sql and return records as []map[string]string
func ( session * Session ) QueryString ( sqlStr string , args ... interface { } ) ( [ ] map [ string ] string , error ) {
defer session . resetStatement ( )
if session . isAutoClose {
defer session . Close ( )
} }
session . queryPreprocess ( & sqlStr , args ... ) if ! session . isAutoCommit {
return session . tx . Exec ( sqlStr , args ... )
if session . isAutoCommit {
return query2 ( session . DB ( ) , sqlStr , args ... )
}
return txQuery2 ( session . tx , sqlStr , args ... )
} }
// Execute sql
func ( session * Session ) innerExec ( sqlStr string , args ... interface { } ) ( sql . Result , error ) {
if session . prepareStmt { if session . prepareStmt {
stmt , err := session . doPrepare ( sqlStr ) stmt , err := session . doPrepare ( sqlStr )
if err != nil { if err != nil {
@ -286,32 +186,8 @@ func (session *Session) innerExec(sqlStr string, args ...interface{}) (sql.Resul
return session . DB ( ) . Exec ( sqlStr , args ... ) return session . DB ( ) . Exec ( sqlStr , args ... )
} }
func ( session * Session ) exec ( sqlStr string , args ... interface { } ) ( sql . Result , error ) {
for _ , filter := range session . engine . dialect . Filters ( ) {
// TODO: for table name, it's no need to RefTable
sqlStr = filter . Do ( sqlStr , session . engine . dialect , session . statement . RefTable )
}
session . saveLastSQL ( sqlStr , args ... )
return session . engine . logSQLExecutionTime ( sqlStr , args , func ( ) ( sql . Result , error ) {
if session . isAutoCommit {
// FIXME: oci8 can not auto commit (github.com/mattn/go-oci8)
if session . engine . dialect . DBType ( ) == core . ORACLE {
session . Begin ( )
r , err := session . tx . Exec ( sqlStr , args ... )
session . Commit ( )
return r , err
}
return session . innerExec ( sqlStr , args ... )
}
return session . tx . Exec ( sqlStr , args ... )
} )
}
// Exec raw sql
// Exec raw sql
func ( session * Session ) Exec ( sqlStr string , args ... interface { } ) ( sql . Result , error ) { func ( session * Session ) Exec ( sqlStr string , args ... interface { } ) ( sql . Result , error ) {
defer session . resetStatement ( )
if session . isAutoClose { if session . isAutoClose {
defer session . Close ( ) defer session . Close ( )
} }
Lunny Xiao
7 years ago
committed by
Lauris BH