haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-17 07:40:25 +00:00
Code Issues Releases Wiki Activity

Only mysql can use config option 'create_tables'.

Browse Source
This commit is contained in:
cuihaikuo
2018-07-09 15:18:06 +08:00
parent 6eab55e149
commit 7c09f53be6
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/branch-mgr.c
View File

@@ -127,7 +127,7 @@ seaf_branch_manager_init (SeafBranchManager *mgr)
static int
open_db (SeafBranchManager *mgr)
{
if (!mgr->seaf->create_tables)
if (!mgr->seaf->create_tables && seaf_db_type (mgr->seaf->db) == SEAF_DB_TYPE_MYSQL)
return 0;
#ifndef SEAFILE_SERVER

2
server/quota-mgr.c
View File

@@ -79,7 +79,7 @@ int
seaf_quota_manager_init (SeafQuotaManager *mgr)
{
if (!mgr->session->create_tables)
if (!mgr->session->create_tables && seaf_db_type (mgr->session->db) == SEAF_DB_TYPE_MYSQL)
return 0;
SeafDB *db = mgr->session->db;

2
server/repo-mgr.c
View File

@@ -1356,7 +1356,7 @@ create_tables_pgsql (SeafRepoManager *mgr)
static int
create_db_tables_if_not_exist (SeafRepoManager *mgr)
{
if (!mgr->seaf->create_tables)
if (!mgr->seaf->create_tables && seaf_db_type (mgr->seaf->db) == SEAF_DB_TYPE_MYSQL)
return 0;
SeafDB *db = mgr->seaf->db;

6
server/seafile-session.c
View File

@@ -207,7 +207,8 @@ seafile_session_init (SeafileSession *session)
return -1;
}
if (session->create_tables && seaf_cfg_manager_init (session->cfg_mgr) < 0) {
if ((session->create_tables || seaf_db_type(session->db) != SEAF_DB_TYPE_MYSQL)
&& seaf_cfg_manager_init (session->cfg_mgr) < 0) {
seaf_warning ("Failed to init config manager.\n");
return -1;
}
@@ -443,7 +444,8 @@ schedule_create_system_default_repo (SeafileSession *session)
sql = "CREATE TABLE IF NOT EXISTS SystemInfo( "
"info_key VARCHAR(256), info_value VARCHAR(1024))";
if (session->create_tables && seaf_db_query (session->db, sql) < 0)
if ((session->create_tables || db_type != SEAF_DB_TYPE_MYSQL)
&& seaf_db_query (session->db, sql) < 0)
return;
ccnet_job_manager_schedule_job (session->job_mgr,

2
server/share-mgr.c
View File

@@ -25,7 +25,7 @@ seaf_share_manager_new (SeafileSession *seaf)
int
seaf_share_manager_start (SeafShareManager *mgr)
{
if (!mgr->seaf->create_tables)
if (!mgr->seaf->create_tables && seaf_db_type (mgr->seaf->db) == SEAF_DB_TYPE_MYSQL)
return 0;
SeafDB *db = mgr->seaf->db;