opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7162 from zexi/feature/db-dispatcher-pass-query

Browse Source 
db_dispatcher: pass query for fetchItem
This commit is contained in:
Zexi Li
2020-07-14 18:59:27 +08:00
committed by GitHub
parent eb28aa0aa5 c777793d96
commit f985ab5d05
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+5 -5
View File
@@ -1473,7 +1473,7 @@ func (dispatcher *DBModelDispatcher) PerformClassAction(ctx context.Context, act
func (dispatcher *DBModelDispatcher) PerformAction(ctx context.Context, idStr string, action string, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, nil)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
@@ -1659,7 +1659,7 @@ func (dispatcher *DBModelDispatcher) FetchUpdateHeaderData(ctx context.Context,
func (dispatcher *DBModelDispatcher) Update(ctx context.Context, idStr string, query jsonutils.JSONObject, data jsonutils.JSONObject, ctxIds []dispatcher.SResourceContext) (jsonutils.JSONObject, error) {
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, nil)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
@@ -1692,7 +1692,7 @@ func (dispatcher *DBModelDispatcher) Update(ctx context.Context, idStr string, q
func (dispatcher *DBModelDispatcher) UpdateSpec(ctx context.Context, idStr string, spec string, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, nil)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
@@ -1762,7 +1762,7 @@ func deleteItem(manager IModelManager, model IModel, ctx context.Context, userCr
func (dispatcher *DBModelDispatcher) Delete(ctx context.Context, idstr string, query jsonutils.JSONObject, data jsonutils.JSONObject, ctxIds []dispatcher.SResourceContext) (jsonutils.JSONObject, error) {
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idstr, nil)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idstr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idstr)
} else if err != nil {
@@ -1796,7 +1796,7 @@ func (dispatcher *DBModelDispatcher) Delete(ctx context.Context, idstr string, q
func (dispatcher *DBModelDispatcher) DeleteSpec(ctx context.Context, idstr string, spec string, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idstr, nil)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idstr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idstr)
} else if err != nil {