llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-04 13:20:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove adapter.file

Browse Source
This commit is contained in:
Yang Luo
2023-07-30 12:08:05 +08:00
parent eefa1e6df4
commit 12e5d9b583
2 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
object/adapter.go
View File

@ -39,7 +39,6 @@ type Adapter struct {
Database string `xorm:"varchar(100)" json:"database"` Database string `xorm:"varchar(100)" json:"database"`
Table string `xorm:"varchar(100)" json:"table"` Table string `xorm:"varchar(100)" json:"table"`
TableNamePrefix string `xorm:"varchar(100)" json:"tableNamePrefix"` TableNamePrefix string `xorm:"varchar(100)" json:"tableNamePrefix"`
File string `xorm:"varchar(100)" json:"file"`
IsEnabled bool `json:"isEnabled"` 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", 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) adapter.User, adapter.Password, adapter.Host, adapter.Port, adapter.Database)
case "sqlite3": case "sqlite3":
dataSourceName = fmt.Sprintf("file:%s", adapter.File) dataSourceName = fmt.Sprintf("file:%s", adapter.Host)
default: default:
return fmt.Errorf("unsupported database type: %s", adapter.DatabaseType) return fmt.Errorf("unsupported database type: %s", adapter.DatabaseType)
} }

17
web/src/AdapterEditPage.js
View File

@ -91,20 +91,6 @@ class AdapterEditPage extends React.Component {
return null; return null;
} }
return ( return (
<React.Fragment>{
this.state.adapter.databaseType === "sqlite3" ?
(
<Row style={{marginTop: "20px"}} >
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
{Setting.getLabel(i18next.t("syncer:File"), i18next.t("provider:File - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.adapter.host} onChange={e => {
this.updateAdapterField("file", e.target.value);
}} />
</Col>
</Row>
) : (
<React.Fragment> <React.Fragment>
<Row style={{marginTop: "20px"}} > <Row style={{marginTop: "20px"}} >
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}> <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
@ -147,9 +133,6 @@ class AdapterEditPage extends React.Component {
</Col> </Col>
</Row> </Row>
</React.Fragment> </React.Fragment>
)
}
</React.Fragment>
); );
} }