You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2023/07/19 15:07:35 UTC

[incubator-devlake] branch main updated: fix: azuredevops automigrate failed on newer gorm (#5701)

This is an automated email from the ASF dual-hosted git repository.

klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 590c0fd5d fix: azuredevops automigrate failed on newer gorm (#5701)
590c0fd5d is described below

commit 590c0fd5db147cd3df313d27f0ee51a12a091b94
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Wed Jul 19 23:07:30 2023 +0800

    fix: azuredevops automigrate failed on newer gorm (#5701)
---
 backend/server/services/remote/models/models.go      | 5 +++++
 backend/server/services/remote/plugin/plugin_impl.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/server/services/remote/models/models.go b/backend/server/services/remote/models/models.go
index d21171e1a..99e94fdaf 100644
--- a/backend/server/services/remote/models/models.go
+++ b/backend/server/services/remote/models/models.go
@@ -138,4 +138,9 @@ type PipelineData struct {
 	Scopes []DynamicDomainScope `json:"scopes"`
 }
 
+type ToolModel struct {
+	common.NoPKModel
+	ConnectionId string `json:"connectionId" gorm:"column:connection_id;not null"`
+}
+
 var _ plugin.ToolLayerScope = (*DynamicScopeModel)(nil)
diff --git a/backend/server/services/remote/plugin/plugin_impl.go b/backend/server/services/remote/plugin/plugin_impl.go
index d76ae1fe9..657409212 100644
--- a/backend/server/services/remote/plugin/plugin_impl.go
+++ b/backend/server/services/remote/plugin/plugin_impl.go
@@ -76,7 +76,7 @@ func newPlugin(info *models.PluginInfo, invoker bridge.Invoker) (*remotePluginIm
 		models.NewDynamicScopeModel(scopeTabler),
 	}
 	for _, toolModelInfo := range info.ToolModelInfos {
-		toolModelTabler, err := toolModelInfo.LoadDynamicTabler(common.NoPKModel{})
+		toolModelTabler, err := toolModelInfo.LoadDynamicTabler(models.ToolModel{})
 		if err != nil {
 			return nil, errors.Default.Wrap(err, fmt.Sprintf("Couldn't load ToolModel type for plugin %s", info.Name))
 		}