73e5c36f25
* Upgrade xorm to v1.2.2 (#16663) Backport #16663 Fix #16683 * Upgrade xorm to v1.2.2 * Change the Engine interface to match xorm v1.2.2 * Add test to ensure that dumping of login sources remains correct (#16847) #16831 has occurred because of a missed regression. This PR adds a simple test to try to prevent this occuring again. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
49 lines
1.1 KiB
Go
Vendored
49 lines
1.1 KiB
Go
Vendored
// Copyright 2021 The Xorm Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package convert
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// Interface2Interface converts interface of pointer as interface of value
|
|
func Interface2Interface(userLocation *time.Location, v interface{}) (interface{}, error) {
|
|
if v == nil {
|
|
return nil, nil
|
|
}
|
|
switch vv := v.(type) {
|
|
case *int64:
|
|
return *vv, nil
|
|
case *int8:
|
|
return *vv, nil
|
|
case *sql.NullString:
|
|
return vv.String, nil
|
|
case *sql.RawBytes:
|
|
if len([]byte(*vv)) > 0 {
|
|
return []byte(*vv), nil
|
|
}
|
|
return nil, nil
|
|
case *sql.NullInt32:
|
|
return vv.Int32, nil
|
|
case *sql.NullInt64:
|
|
return vv.Int64, nil
|
|
case *sql.NullFloat64:
|
|
return vv.Float64, nil
|
|
case *sql.NullBool:
|
|
if vv.Valid {
|
|
return vv.Bool, nil
|
|
}
|
|
return nil, nil
|
|
case *sql.NullTime:
|
|
if vv.Valid {
|
|
return vv.Time.In(userLocation).Format("2006-01-02 15:04:05"), nil
|
|
}
|
|
return "", nil
|
|
default:
|
|
return "", fmt.Errorf("convert assign string unsupported type: %#v", vv)
|
|
}
|
|
}
|