From 12e5d9b5832819809ddf223fb65a4577ff434fe8 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sun, 30 Jul 2023 12:08:05 +0800 Subject: [PATCH] Remove adapter.file --- object/adapter.go | 3 +- web/src/AdapterEditPage.js | 99 ++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 60 deletions(-) diff --git a/object/adapter.go b/object/adapter.go index c1ba1c87..f1a7fa02 100644 --- a/object/adapter.go +++ b/object/adapter.go @@ -39,7 +39,6 @@ type Adapter struct { Database string `xorm:"varchar(100)" json:"database"` Table string `xorm:"varchar(100)" json:"table"` TableNamePrefix string `xorm:"varchar(100)" json:"tableNamePrefix"` - File string `xorm:"varchar(100)" json:"file"` IsEnabled bool `json:"isEnabled"` @@ -171,7 +170,7 @@ func (adapter *Adapter) initAdapter() error { dataSourceName = fmt.Sprintf("user=%s password=%s host=%s port=%s sslmode=disable dbname=%s serial_normalization=virtual_sequence", adapter.User, adapter.Password, adapter.Host, adapter.Port, adapter.Database) case "sqlite3": - dataSourceName = fmt.Sprintf("file:%s", adapter.File) + dataSourceName = fmt.Sprintf("file:%s", adapter.Host) default: return fmt.Errorf("unsupported database type: %s", adapter.DatabaseType) } diff --git a/web/src/AdapterEditPage.js b/web/src/AdapterEditPage.js index 58ae85dc..1a3d428d 100644 --- a/web/src/AdapterEditPage.js +++ b/web/src/AdapterEditPage.js @@ -91,64 +91,47 @@ class AdapterEditPage extends React.Component { return null; } return ( - { - this.state.adapter.databaseType === "sqlite3" ? - ( - - - {Setting.getLabel(i18next.t("syncer:File"), i18next.t("provider:File - Tooltip"))} : - - - { - this.updateAdapterField("file", e.target.value); - }} /> - - - ) : ( - - - - {Setting.getLabel(i18next.t("provider:Host"), i18next.t("provider:Host - Tooltip"))} : - - - { - this.updateAdapterField("host", e.target.value); - }} /> - - - - - {Setting.getLabel(i18next.t("provider:Port"), i18next.t("provider:Port - Tooltip"))} : - - - { - this.updateAdapterField("port", e.target.value); - }} /> - - - - - {Setting.getLabel(i18next.t("general:User"), i18next.t("general:User - Tooltip"))} : - - - { - this.updateAdapterField("user", e.target.value); - }} /> - - - - - {Setting.getLabel(i18next.t("general:Password"), i18next.t("general:Password - Tooltip"))} : - - - { - this.updateAdapterField("password", e.target.value); - }} /> - - - - ) - } + + + + {Setting.getLabel(i18next.t("provider:Host"), i18next.t("provider:Host - Tooltip"))} : + + + { + this.updateAdapterField("host", e.target.value); + }} /> + + + + + {Setting.getLabel(i18next.t("provider:Port"), i18next.t("provider:Port - Tooltip"))} : + + + { + this.updateAdapterField("port", e.target.value); + }} /> + + + + + {Setting.getLabel(i18next.t("general:User"), i18next.t("general:User - Tooltip"))} : + + + { + this.updateAdapterField("user", e.target.value); + }} /> + + + + + {Setting.getLabel(i18next.t("general:Password"), i18next.t("general:Password - Tooltip"))} : + + + { + this.updateAdapterField("password", e.target.value); + }} /> + + ); }