haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-09-02 13:25:03 +00:00
Code Issues Releases Wiki Activity

Add primary key for mysql table.

Browse Source 
Add column names in 'INSERT' and 'REPLACE' sql.
This commit is contained in:
cuihaikuo
2018-04-18 14:04:05 +08:00
parent 42238c0211
commit fa66f61ed0
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
net/server/group-mgr.c
View File

@@ -104,7 +104,7 @@ static int check_db_table (CcnetGroupManager *manager, CcnetDB *db)
int db_type = ccnet_db_type (db);
if (db_type == CCNET_DB_TYPE_MYSQL) {
g_string_printf (group_sql,
"CREATE TABLE IF NOT EXISTS `%s` (`group_id` INTEGER"
"CREATE TABLE IF NOT EXISTS `%s` (`group_id` BIGINT "
" PRIMARY KEY AUTO_INCREMENT, `group_name` VARCHAR(255),"
" `creator_name` VARCHAR(255), `timestamp` BIGINT,"
" `type` VARCHAR(32), `parent_group_id` INTEGER)"
@@ -114,20 +114,23 @@ static int check_db_table (CcnetGroupManager *manager, CcnetDB *db)
return -1;
}
sql = "CREATE TABLE IF NOT EXISTS `GroupUser` (`group_id` INTEGER,"
" `user_name` VARCHAR(255), `is_staff` tinyint, PRIMARY KEY"
sql = "CREATE TABLE IF NOT EXISTS `GroupUser` ( "
"`id` BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, `group_id` BIGINT,"
" `user_name` VARCHAR(255), `is_staff` tinyint, UNIQUE INDEX"
" (`group_id`, `user_name`), INDEX (`user_name`))"
"ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS GroupDNPair (group_id INTEGER,"
sql = "CREATE TABLE IF NOT EXISTS GroupDNPair ( "
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, group_id INTEGER,"
" dn VARCHAR(255))ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS GroupStructure (group_id INTEGER PRIMARY KEY, "
"path VARCHAR(1024))ENGINE=INNODB";
sql = "CREATE TABLE IF NOT EXISTS GroupStructure ( "
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, group_id INTEGER, "
"path VARCHAR(1024), UNIQUE INDEX(group_id))ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
} else if (db_type == CCNET_DB_TYPE_SQLITE) {
@@ -271,7 +274,7 @@ create_group_common (CcnetGroupManager *mgr,
if (group_id < 0)
goto error;
g_string_printf (sql, "INSERT INTO GroupUser VALUES (?, ?, ?)");
g_string_printf (sql, "INSERT INTO GroupUser (group_id, user_name, is_staff) VALUES (?, ?, ?)");
if (ccnet_db_trans_query (trans, sql->str, 3,
"int", group_id, "string", user_name_l,
@@ -279,7 +282,7 @@ create_group_common (CcnetGroupManager *mgr,
goto error;
if (parent_group_id == -1) {
g_string_printf (sql, "INSERT INTO GroupStructure VALUES (?,'%d')", group_id);
g_string_printf (sql, "INSERT INTO GroupStructure (group_id, path) VALUES (?,'%d')", group_id);
if (ccnet_db_trans_query (trans, sql->str, 1, "int", group_id) < 0)
goto error;
} else if (parent_group_id > 0) {
@@ -289,7 +292,7 @@ create_group_common (CcnetGroupManager *mgr,
&path, 1, "int", parent_group_id);
if (!path)
goto error;
g_string_printf (sql, "INSERT INTO GroupStructure VALUES (?, '%s, %d')", path, group_id);
g_string_printf (sql, "INSERT INTO GroupStructure (group_id, path) VALUES (?, '%s, %d')", path, group_id);
if (ccnet_db_trans_query (trans, sql->str, 1, "int", group_id) < 0) {
g_free (path);
goto error;
@@ -485,7 +488,7 @@ int ccnet_group_manager_add_member (CcnetGroupManager *mgr,
/* } */
char *member_name_l = g_ascii_strdown (member_name, -1);
int rc = ccnet_db_statement_query (db, "INSERT INTO GroupUser VALUES (?, ?, ?)",
int rc = ccnet_db_statement_query (db, "INSERT INTO GroupUser (group_id, user_name, is_staff) VALUES (?, ?, ?)",
3, "int", group_id, "string", member_name_l,
"int", 0);
g_free (member_name_l);

18
net/server/org-mgr.c
View File

@@ -90,7 +90,7 @@ static int check_db_table (CcnetDB *db)
int db_type = ccnet_db_type (db);
if (db_type == CCNET_DB_TYPE_MYSQL) {
sql = "CREATE TABLE IF NOT EXISTS Organization (org_id INTEGER"
sql = "CREATE TABLE IF NOT EXISTS Organization (org_id BIGINT"
" PRIMARY KEY AUTO_INCREMENT, org_name VARCHAR(255),"
" url_prefix VARCHAR(255), creator VARCHAR(255), ctime BIGINT,"
" UNIQUE INDEX (url_prefix))"
@@ -98,16 +98,18 @@ static int check_db_table (CcnetDB *db)
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS OrgUser (org_id INTEGER, "
sql = "CREATE TABLE IF NOT EXISTS OrgUser ( "
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, org_id INTEGER, "
"email VARCHAR(255), is_staff BOOL NOT NULL, "
"INDEX (email), PRIMARY KEY (org_id, email))"
"INDEX (email), UNIQUE INDEX(org_id, email))"
"ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS OrgGroup (org_id INTEGER, "
sql = "CREATE TABLE IF NOT EXISTS OrgGroup ("
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, org_id INTEGER, "
"group_id INTEGER, INDEX (group_id), "
"PRIMARY KEY (org_id, group_id))"
"UNIQUE INDEX(org_id, group_id))"
"ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
@@ -218,7 +220,7 @@ int ccnet_org_manager_create_org (CcnetOrgManager *mgr,
return -1;
}
rc = ccnet_db_statement_query (db, "INSERT INTO OrgUser values (?, ?, ?)",
rc = ccnet_db_statement_query (db, "INSERT INTO OrgUser (org_id, email, is_staff) values (?, ?, ?)",
3, "int", org_id, "string", creator, "int", 1);
if (rc < 0) {
ccnet_db_statement_query (db, "DELETE FROM Organization WHERE org_id=?",
@@ -395,7 +397,7 @@ ccnet_org_manager_add_org_user (CcnetOrgManager *mgr,
{
CcnetDB *db = mgr->priv->db;
return ccnet_db_statement_query (db, "INSERT INTO OrgUser values (?, ?, ?)",
return ccnet_db_statement_query (db, "INSERT INTO OrgUser (org_id, email, is_staff) values (?, ?, ?)",
3, "int", org_id, "string", email,
"int", is_staff);
}
@@ -518,7 +520,7 @@ ccnet_org_manager_add_org_group (CcnetOrgManager *mgr,
{
CcnetDB *db = mgr->priv->db;
return ccnet_db_statement_query (db, "INSERT INTO OrgGroup VALUES (?, ?)",
return ccnet_db_statement_query (db, "INSERT INTO OrgGroup (org_id, group_id) VALUES (?, ?)",
2, "int", org_id, "int", group_id);
}

12
net/server/user-mgr.c
View File

@@ -558,7 +558,7 @@ static int check_db_table (CcnetDB *db)
int db_type = ccnet_db_type (db);
if (db_type == CCNET_DB_TYPE_MYSQL) {
sql = "CREATE TABLE IF NOT EXISTS EmailUser ("
"id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, "
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, "
"email VARCHAR(255), passwd VARCHAR(256), "
"is_staff BOOL NOT NULL, is_active BOOL NOT NULL, "
"ctime BIGINT, reference_id VARCHAR(255),"
@@ -566,21 +566,22 @@ static int check_db_table (CcnetDB *db)
"ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS Binding (email VARCHAR(255), peer_id CHAR(41),"
sql = "CREATE TABLE IF NOT EXISTS Binding (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, "
"email VARCHAR(255), peer_id CHAR(41),"
"UNIQUE INDEX (peer_id), INDEX (email(20)))"
"ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS UserRole ("
"id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, "
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, "
"email VARCHAR(255), role VARCHAR(255), UNIQUE INDEX (email)) "
"ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS LDAPUsers ("
"id INTEGER PRIMARY KEY AUTO_INCREMENT, "
"id BIGINT PRIMARY KEY AUTO_INCREMENT, "
"email VARCHAR(255) NOT NULL, password varchar(255) NOT NULL, "
"is_staff BOOL NOT NULL, is_active BOOL NOT NULL, extra_attrs TEXT, "
"reference_id VARCHAR(255), "
@@ -588,7 +589,8 @@ static int check_db_table (CcnetDB *db)
if (ccnet_db_query (db, sql) < 0)
return -1;
sql = "CREATE TABLE IF NOT EXISTS LDAPConfig (cfg_group VARCHAR(255) NOT NULL,"
sql = "CREATE TABLE IF NOT EXISTS LDAPConfig ( "
"id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, cfg_group VARCHAR(255) NOT NULL,"
"cfg_key VARCHAR(255) NOT NULL, value VARCHAR(255), property INTEGER) ENGINE=INNODB";
if (ccnet_db_query (db, sql) < 0)
return -1;