llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the issue that database syncer can't work with null-fields on source table

Browse Source
This commit is contained in:
Yang Luo 2023-09-12 16:06:44 +08:00
parent dc57c476b7
commit 0fe34c2f53
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
object/syncer_user.go
View File

@ -15,6 +15,7 @@
package object package object
import ( import (
"database/sql"
"fmt" "fmt"
"strings" "strings"
"time" "time"
@ -31,7 +32,7 @@ type Credential struct {
} }
func (syncer *Syncer) getOriginalUsers() ([]*OriginalUser, error) { func (syncer *Syncer) getOriginalUsers() ([]*OriginalUser, error) {
var results []map[string]string var results []map[string]sql.NullString
err := syncer.Ormer.Engine.Table(syncer.getTable()).Find(&results) err := syncer.Ormer.Engine.Table(syncer.getTable()).Find(&results)
if err != nil { if err != nil {
return nil, err return nil, err

11
object/syncer_util.go
View File

@ -15,6 +15,7 @@
package object package object
import ( import (
"database/sql"
"encoding/json" "encoding/json"
"fmt" "fmt"
"reflect" "reflect"
@ -196,7 +197,7 @@ func (syncer *Syncer) getUserValue(user *User, key string) string {
} }
} }
func (syncer *Syncer) getOriginalUsersFromMap(results []map[string]string) []*OriginalUser { func (syncer *Syncer) getOriginalUsersFromMap(results []map[string]sql.NullString) []*OriginalUser {
users := []*OriginalUser{} users := []*OriginalUser{}
for _, result := range results { for _, result := range results {
originalUser := &OriginalUser{ originalUser := &OriginalUser{
@ -216,11 +217,11 @@ func (syncer *Syncer) getOriginalUsersFromMap(results []map[string]string) []*Or
names := strings.Split(tableColumnName, "+") names := strings.Split(tableColumnName, "+")
var values []string var values []string
for _, name := range names { for _, name := range names {
values = append(values, result[strings.Trim(name, " ")]) values = append(values, result[strings.Trim(name, " ")].String)
} }
value = strings.Join(values, " ") value = strings.Join(values, " ")
} else { } else {
value = result[tableColumnName] value = result[tableColumnName].String
} }
syncer.setUserByKeyValue(originalUser, tableColumn.CasdoorName, value) syncer.setUserByKeyValue(originalUser, tableColumn.CasdoorName, value)
} }
@ -249,9 +250,9 @@ func (syncer *Syncer) getOriginalUsersFromMap(results []map[string]string) []*Or
// enable // enable
value, ok := result["ENABLED"] value, ok := result["ENABLED"]
if ok { if ok {
originalUser.IsForbidden = !util.ParseBool(value) originalUser.IsForbidden = !util.ParseBool(value.String)
} else { } else {
originalUser.IsForbidden = !util.ParseBool(result["enabled"]) originalUser.IsForbidden = !util.ParseBool(result["enabled"].String)
} }
} }