From ec3c24ba68d593b0c7c1f1913aa307cf1968e390 Mon Sep 17 00:00:00 2001 From: Yaodong Yu <2814461814@qq.com> Date: Sat, 3 Jun 2023 00:15:28 +0800 Subject: [PATCH] feat: fix the bug that sycner does not initialize (#1924) --- object/syncer_public_api.go | 15 ++++++--------- object/syncer_user.go | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/object/syncer_public_api.go b/object/syncer_public_api.go index ac65c03e..7413c769 100644 --- a/object/syncer_public_api.go +++ b/object/syncer_public_api.go @@ -14,7 +14,10 @@ package object -import "fmt" +import ( + "errors" + "fmt" +) func getDbSyncerForUser(user *User) (*Syncer, error) { syncers, err := GetSyncers("admin") @@ -38,10 +41,11 @@ func getEnabledSyncerForOrganization(organization string) (*Syncer, error) { for _, syncer := range syncers { if syncer.Organization == organization && syncer.IsEnabled { + syncer.initAdapter() return syncer, nil } } - return nil, nil + return nil, errors.New("no enabled syncer found") } func AddUserToOriginalDatabase(user *User) error { @@ -50,10 +54,6 @@ func AddUserToOriginalDatabase(user *User) error { return err } - if syncer == nil { - return nil - } - updatedOUser := syncer.createOriginalUserFromUser(user) _, err = syncer.addUser(updatedOUser) if err != nil { @@ -69,9 +69,6 @@ func UpdateUserToOriginalDatabase(user *User) error { if err != nil { return err } - if syncer == nil { - return nil - } newUser, err := GetUser(user.GetId()) if err != nil { diff --git a/object/syncer_user.go b/object/syncer_user.go index a592e3f8..22e2d24e 100644 --- a/object/syncer_user.go +++ b/object/syncer_user.go @@ -107,7 +107,7 @@ func (syncer *Syncer) updateUser(user *OriginalUser) (bool, error) { delete(m, syncer.TablePrimaryKey) 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) if err != nil { return false, err