1
0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-08-18 20:37:01 +00:00

Fix insert error when role is NULL

This commit is contained in:
杨赫然 2020-11-18 13:59:02 +08:00
parent 908a024603
commit cea21e7ac6

View File

@ -1713,12 +1713,12 @@ ccnet_user_manager_get_role_emailuser (CcnetUserManager *manager,
CcnetDB *db = manager->priv->db; CcnetDB *db = manager->priv->db;
const char *sql; const char *sql;
char* role; char* role_email;
sql = "SELECT role FROM UserRole WHERE email=?"; sql = "SELECT email FROM UserRole WHERE email=?";
if (ccnet_db_statement_foreach_row (db, sql, get_role_emailuser_cb, &role, if (ccnet_db_statement_foreach_row (db, sql, get_role_emailuser_cb, &role_email,
1, "string", email) > 0) 1, "string", email) > 0)
return role; return role_email;
return NULL; return NULL;
} }
@ -1728,9 +1728,9 @@ ccnet_user_manager_update_role_emailuser (CcnetUserManager *manager,
const char* email, const char* role) const char* email, const char* role)
{ {
CcnetDB* db = manager->priv->db; CcnetDB* db = manager->priv->db;
char *old_role = ccnet_user_manager_get_role_emailuser (manager, email); char *role_email = ccnet_user_manager_get_role_emailuser (manager, email);
if (old_role) { if (role_email) {
g_free (old_role); g_free (role_email);
return ccnet_db_statement_query (db, "UPDATE UserRole SET role=? " return ccnet_db_statement_query (db, "UPDATE UserRole SET role=? "
"WHERE email=?", "WHERE email=?",
2, "string", role, "string", email); 2, "string", role, "string", email);