Plugins: Fix problematic query (#46777)

Fixes mysql error "sql: expected 0 arguments, got 1" introduced via #46283
pull/45340/head^2
Marcus Efraimsson 3 years ago committed by GitHub
parent 912018ff64
commit 1044585b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      pkg/services/sqlstore/plugin_setting.go

@ -8,21 +8,24 @@ import (
) )
func (ss *SQLStore) GetPluginSettings(ctx context.Context, orgID int64) ([]*models.PluginSetting, error) { func (ss *SQLStore) GetPluginSettings(ctx context.Context, orgID int64) ([]*models.PluginSetting, error) {
var rslt = make([]*models.PluginSetting, 0) sql := `SELECT org_id, plugin_id, enabled, pinned, plugin_version
err := ss.WithDbSession(ctx, func(sess *DBSession) error { FROM plugin_setting `
if orgID != 0 { params := make([]interface{}, 0)
sess.Where("org_id", orgID)
}
err := sess.Find(&rslt) if orgID != 0 {
if err != nil { sql += "WHERE org_id=?"
return err params = append(params, orgID)
} }
return nil var rslt []*models.PluginSetting
err := ss.WithDbSession(ctx, func(sess *DBSession) error {
return sess.SQL(sql, params...).Find(&rslt)
}) })
if err != nil {
return nil, err
}
return rslt, err return rslt, nil
} }
func (ss *SQLStore) GetPluginSettingById(ctx context.Context, query *models.GetPluginSettingByIdQuery) error { func (ss *SQLStore) GetPluginSettingById(ctx context.Context, query *models.GetPluginSettingByIdQuery) error {

Loading…
Cancel
Save