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

Revert "feat: fix the bug that sycner does not initialize (#1924)"

Browse Source 
This reverts commit ec3c24ba68d593b0c7c1f1913aa307cf1968e390.
This commit is contained in:
hsluoyz 2023-06-03 09:12:49 +08:00 committed by GitHub
parent 0ec22ae6ff
commit 6db9c6861d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
object/syncer_public_api.go
View File

@ -14,10 +14,7 @@
package object package object
import ( import "fmt"
"errors"
"fmt"
)
func getDbSyncerForUser(user *User) (*Syncer, error) { func getDbSyncerForUser(user *User) (*Syncer, error) {
syncers, err := GetSyncers("admin") syncers, err := GetSyncers("admin")
@ -41,11 +38,10 @@ func getEnabledSyncerForOrganization(organization string) (*Syncer, error) {
for _, syncer := range syncers { for _, syncer := range syncers {
if syncer.Organization == organization && syncer.IsEnabled { if syncer.Organization == organization && syncer.IsEnabled {
syncer.initAdapter()
return syncer, nil return syncer, nil
} }
} }
return nil, errors.New("no enabled syncer found") return nil, nil
} }
func AddUserToOriginalDatabase(user *User) error { func AddUserToOriginalDatabase(user *User) error {
@ -54,6 +50,10 @@ func AddUserToOriginalDatabase(user *User) error {
return err return err
} }
if syncer == nil {
return nil
}
updatedOUser := syncer.createOriginalUserFromUser(user) updatedOUser := syncer.createOriginalUserFromUser(user)
_, err = syncer.addUser(updatedOUser) _, err = syncer.addUser(updatedOUser)
if err != nil { if err != nil {
@ -69,6 +69,9 @@ func UpdateUserToOriginalDatabase(user *User) error {
if err != nil { if err != nil {
return err return err
} }
if syncer == nil {
return nil
}
newUser, err := GetUser(user.GetId()) newUser, err := GetUser(user.GetId())
if err != nil { if err != nil {

2
object/syncer_user.go
View File

@ -107,7 +107,7 @@ func (syncer *Syncer) updateUser(user *OriginalUser) (bool, error) {
delete(m, syncer.TablePrimaryKey) delete(m, syncer.TablePrimaryKey)
setString := syncer.getSqlSetStringFromMap(m) setString := syncer.getSqlSetStringFromMap(m)
sql := fmt.Sprintf("update %s set %s where %s = '%s'", syncer.getTable(), setString, syncer.TablePrimaryKey, pkValue) sql := fmt.Sprintf("update %s set %s where %s = %s", syncer.getTable(), setString, syncer.TablePrimaryKey, pkValue)
res, err := syncer.Adapter.Engine.Exec(sql) res, err := syncer.Adapter.Engine.Exec(sql)
if err != nil { if err != nil {
return false, err return false, err