mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-08-04 04:47:49 +08:00
Merge branch 'dev' into feature/20260602_connection_driver_i18n
This commit is contained in:
@@ -195,7 +195,7 @@ func (a *App) CreateDatabase(config connection.ConnectionConfig, dbName string)
|
||||
if dbName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.database_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.create_database"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.create_database"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
|
||||
@@ -368,7 +368,7 @@ func resolveSchemaDDLTargetDatabaseWithText(config connection.ConnectionConfig,
|
||||
}
|
||||
|
||||
func (a *App) CreateSchema(config connection.ConnectionConfig, dbName string, schemaName string) connection.QueryResult {
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.create_schema"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.create_schema"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
dbType := resolveDDLDBType(config)
|
||||
@@ -396,7 +396,7 @@ func (a *App) CreateSchema(config connection.ConnectionConfig, dbName string, sc
|
||||
}
|
||||
|
||||
func (a *App) RenameSchema(config connection.ConnectionConfig, dbName string, oldSchemaName string, newSchemaName string) connection.QueryResult {
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.rename_schema"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.rename_schema"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
dbType := resolveDDLDBType(config)
|
||||
@@ -422,7 +422,7 @@ func (a *App) RenameSchema(config connection.ConnectionConfig, dbName string, ol
|
||||
}
|
||||
|
||||
func (a *App) DropSchema(config connection.ConnectionConfig, dbName string, schemaName string) connection.QueryResult {
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.drop_schema"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.drop_schema"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
dbType := resolveDDLDBType(config)
|
||||
@@ -680,7 +680,7 @@ func (a *App) RenameDatabase(config connection.ConnectionConfig, oldName string,
|
||||
if oldName == "" || newName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.database_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.rename_database"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.rename_database"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
if strings.EqualFold(oldName, newName) {
|
||||
@@ -726,7 +726,7 @@ func (a *App) DropDatabase(config connection.ConnectionConfig, dbName string) co
|
||||
if dbName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.database_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.drop_database"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.drop_database"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
|
||||
@@ -763,7 +763,7 @@ func (a *App) RenameTable(config connection.ConnectionConfig, dbName string, old
|
||||
if oldTableName == "" || newTableName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.table_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.rename_table"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.rename_table"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
if strings.EqualFold(oldTableName, newTableName) {
|
||||
@@ -818,7 +818,7 @@ func (a *App) DropTable(config connection.ConnectionConfig, dbName string, table
|
||||
if tableName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.table_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.drop_table"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.drop_table"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
|
||||
@@ -885,7 +885,7 @@ func (a *App) DBQueryWithCancel(config connection.ConnectionConfig, dbName strin
|
||||
}
|
||||
|
||||
query = sanitizeSQLForPgLike(resolveDDLDBType(config), query)
|
||||
if err := ensureReadOnlyConnectionAllowsQuery(config, query); err != nil {
|
||||
if err := ensureConnectionAllowsQuery(config, query); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
|
||||
}
|
||||
|
||||
@@ -1021,7 +1021,7 @@ func (a *App) DBQueryMulti(config connection.ConnectionConfig, dbName string, qu
|
||||
}
|
||||
|
||||
query = sanitizeSQLForPgLike(resolveDDLDBType(config), query)
|
||||
if err := ensureReadOnlyConnectionAllowsQuery(config, query); err != nil {
|
||||
if err := ensureConnectionAllowsQuery(config, query); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error(), QueryID: queryID}
|
||||
}
|
||||
|
||||
@@ -1429,7 +1429,7 @@ func (a *App) DBQueryIsolated(config connection.ConnectionConfig, dbName string,
|
||||
runConfig := normalizeRunConfig(config, dbName)
|
||||
|
||||
query = sanitizeSQLForPgLike(resolveDDLDBType(config), query)
|
||||
if err := ensureReadOnlyConnectionAllowsQuery(config, query); err != nil {
|
||||
if err := ensureConnectionAllowsQuery(config, query); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
|
||||
@@ -2318,7 +2318,7 @@ func (a *App) DropView(config connection.ConnectionConfig, dbName string, viewNa
|
||||
if viewName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.view_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.drop_view"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.drop_view"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
|
||||
@@ -2353,7 +2353,7 @@ func (a *App) DropFunction(config connection.ConnectionConfig, dbName string, ro
|
||||
if routineName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.routine_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.drop_function_or_procedure"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.drop_function_or_procedure"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
if routineType != "FUNCTION" && routineType != "PROCEDURE" {
|
||||
@@ -2398,7 +2398,7 @@ func (a *App) RenameView(config connection.ConnectionConfig, dbName string, oldN
|
||||
if oldName == "" || newName == "" {
|
||||
return connection.QueryResult{Success: false, Message: a.appText("db.backend.error.view_name_required", nil)}
|
||||
}
|
||||
if err := ensureReadOnlyConnectionAllowsAction(config, "connection.backend.action.rename_view"); err != nil {
|
||||
if err := ensureConnectionAllowsStructureEdit(config, "connection.backend.action.rename_view"); err != nil {
|
||||
return connection.QueryResult{Success: false, Message: err.Error()}
|
||||
}
|
||||
if strings.EqualFold(oldName, newName) {
|
||||
|
||||
Reference in New Issue
Block a user