haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-06-26 13:41:35 +00:00
Code Issues Releases Wiki Activity

Don't create tables in running program by default.

Browse Source
This commit is contained in:
cuihaikuo 2019-03-27 16:17:29 +08:00
parent d649953073
commit 0289c20b08
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ open_db (CcnetGroupManager *manager)
return -1; return -1;
manager->priv->db = db; manager->priv->db = db;
if ((manager->session->create_tables || ccnet_db_type(db) != CCNET_DB_TYPE_MYSQL) if ((manager->session->create_tables || ccnet_db_type(db) == CCNET_DB_TYPE_PGSQL)
&& check_db_table (manager, db) < 0) { && check_db_table (manager, db) < 0) {
ccnet_warning ("Failed to create group db tables.\n"); ccnet_warning ("Failed to create group db tables.\n");
return -1; return -1;

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

@ -75,7 +75,7 @@ open_db (CcnetOrgManager *manager)
return -1; return -1;
manager->priv->db = db; manager->priv->db = db;
if ((manager->session->create_tables || ccnet_db_type(db) != CCNET_DB_TYPE_MYSQL) if ((manager->session->create_tables || ccnet_db_type(db) == CCNET_DB_TYPE_PGSQL)
&& check_db_table (db) < 0) { && check_db_table (db) < 0) {
ccnet_warning ("Failed to create org db tables.\n"); ccnet_warning ("Failed to create org db tables.\n");
return -1; return -1;

11
net/server/server-session.c
View File

@ -131,7 +131,6 @@ static int init_mysql_database (CcnetSession *session)
char *host, *user, *passwd, *db, *unix_socket, *charset; char *host, *user, *passwd, *db, *unix_socket, *charset;
int port; int port;
gboolean use_ssl = FALSE; gboolean use_ssl = FALSE;
gboolean create_tables = TRUE;
int max_connections = 0; int max_connections = 0;
host = ccnet_key_file_get_string (session->keyf, "Database", "HOST"); host = ccnet_key_file_get_string (session->keyf, "Database", "HOST");
@ -167,10 +166,6 @@ static int init_mysql_database (CcnetSession *session)
"Database", "UNIX_SOCKET"); "Database", "UNIX_SOCKET");
use_ssl = g_key_file_get_boolean (session->keyf, "Database", "USE_SSL", NULL); use_ssl = g_key_file_get_boolean (session->keyf, "Database", "USE_SSL", NULL);
if (g_key_file_has_key (session->keyf, "Database", "CREATE_TABLES", NULL))
create_tables = g_key_file_get_boolean (session->keyf, "Database", "CREATE_TABLES", NULL);
session->create_tables = create_tables;
charset = ccnet_key_file_get_string (session->keyf, charset = ccnet_key_file_get_string (session->keyf,
"Database", "CONNECTION_CHARSET"); "Database", "CONNECTION_CHARSET");
@ -255,6 +250,7 @@ load_database_config (CcnetSession *session)
{ {
int ret; int ret;
char *engine; char *engine;
gboolean create_tables = FALSE;
engine = ccnet_key_file_get_string (session->keyf, "Database", "ENGINE"); engine = ccnet_key_file_get_string (session->keyf, "Database", "ENGINE");
if (!engine || strncasecmp (engine, DB_SQLITE, sizeof(DB_SQLITE)) == 0) { if (!engine || strncasecmp (engine, DB_SQLITE, sizeof(DB_SQLITE)) == 0) {
@ -277,6 +273,11 @@ load_database_config (CcnetSession *session)
ccnet_warning ("Unknown database type: %s.\n", engine); ccnet_warning ("Unknown database type: %s.\n", engine);
ret = -1; ret = -1;
} }
if (ret == 0) {
if (g_key_file_has_key (session->keyf, "Database", "CREATE_TABLES", NULL))
create_tables = g_key_file_get_boolean (session->keyf, "Database", "CREATE_TABLES", NULL);
session->create_tables = create_tables;
}
return ret; return ret;
} }

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

@ -764,7 +764,7 @@ open_db (CcnetUserManager *manager)
return -1; return -1;
manager->priv->db = db; manager->priv->db = db;
if ((manager->session->create_tables || ccnet_db_type(db) != CCNET_DB_TYPE_MYSQL) if ((manager->session->create_tables || ccnet_db_type(db) == CCNET_DB_TYPE_PGSQL)
&& check_db_table (db) < 0) { && check_db_table (db) < 0) {
ccnet_warning ("Failed to create user db tables.\n"); ccnet_warning ("Failed to create user db tables.\n");
return -1; return -1;