This is an automated email from the ASF dual-hosted git repository.
warren 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 2a938065b refactor: merge core.Table and dal.Tabler (#4025)
2a938065b is described below
commit 2a938065b7ee02fb83a698b2bf7205d7499f8e3a
Author: perhapzz <[email protected]>
AuthorDate: Mon Dec 26 21:16:34 2022 +0800
refactor: merge core.Table and dal.Tabler (#4025)
* refactor: replace core.Tabler with dal.Tabler
* refactor: replace core.Tabler with dal.Tabler
* refactor: replace core.Tabler with dal.Tabler
---
api/plugininfo/plugininifo.go | 3 ++-
helpers/migrationhelper/migrationhelper_test.go | 8 ++++----
helpers/pluginhelper/tap/models.go | 4 ++--
plugins/ae/impl/impl.go | 5 +++--
plugins/azure/impl/impl.go | 5 +++--
plugins/bitbucket/impl/impl.go | 5 +++--
plugins/core/plugin_model.go | 7 ++-----
plugins/customize/impl/impl.go | 5 +++--
plugins/dbt/impl/impl.go | 5 +++--
plugins/dora/impl/impl.go | 5 +++--
plugins/feishu/impl/impl.go | 5 +++--
plugins/gitee/impl/impl.go | 5 +++--
plugins/gitextractor/impl/impl.go | 5 +++--
plugins/github/impl/impl.go | 4 ++--
plugins/github_graphql/impl/impl.go | 5 +++--
plugins/gitlab/impl/impl.go | 4 ++--
plugins/icla/impl/impl.go | 5 +++--
plugins/jenkins/impl/impl.go | 4 ++--
plugins/jira/impl/impl.go | 4 ++--
plugins/org/impl/impl.go | 5 +++--
plugins/refdiff/impl/impl.go | 5 +++--
plugins/starrocks/impl/impl.go | 5 +++--
plugins/tapd/impl/impl.go | 5 +++--
plugins/webhook/impl/impl.go | 5 +++--
24 files changed, 66 insertions(+), 52 deletions(-)
diff --git a/api/plugininfo/plugininifo.go b/api/plugininfo/plugininifo.go
index 4868f883f..6ac8bb28e 100644
--- a/api/plugininfo/plugininifo.go
+++ b/api/plugininfo/plugininifo.go
@@ -28,6 +28,7 @@ import (
"github.com/apache/incubator-devlake/api/shared"
"github.com/apache/incubator-devlake/models/domainlayer/domaininfo"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/utils"
"github.com/gin-gonic/gin"
"gorm.io/gorm/schema"
@@ -82,7 +83,7 @@ type PluginMeta struct {
type PluginMetas []PluginMeta
-func NewTableInfos(table core.Tabler) *TableInfos {
+func NewTableInfos(table dal.Tabler) *TableInfos {
tableInfos := &TableInfos{
TableName: table.TableName(),
Error: nil,
diff --git a/helpers/migrationhelper/migrationhelper_test.go
b/helpers/migrationhelper/migrationhelper_test.go
index cf49a4f15..0d1a359de 100644
--- a/helpers/migrationhelper/migrationhelper_test.go
+++ b/helpers/migrationhelper/migrationhelper_test.go
@@ -132,7 +132,7 @@ func TestTransformTable(t *testing.T) {
// for Primarykey autoincrement cheking
mockDal.On("GetColumns", mock.Anything, mock.Anything).Run(func(args
mock.Arguments) {
- tableName := args.Get(0).(core.Tabler).TableName()
+ tableName := args.Get(0).(dal.Tabler).TableName()
assert.Equal(t, tableName, TestTableNameSrc)
}).Return([]dal.ColumnMeta{}, nil).Once()
@@ -203,7 +203,7 @@ func TestTransformTable_RollBack(t *testing.T) {
// for Primarykey autoincrement cheking
mockDal.On("GetColumns", mock.Anything, mock.Anything).Run(func(args
mock.Arguments) {
- tableName := args.Get(0).(core.Tabler).TableName()
+ tableName := args.Get(0).(dal.Tabler).TableName()
assert.Equal(t, tableName, TestTableNameSrc)
}).Return([]dal.ColumnMeta{}, nil).Once()
@@ -296,7 +296,7 @@ func TestCopyTableColumns(t *testing.T) {
// for Primarykey autoincrement cheking
mockDal.On("GetColumns", mock.Anything, mock.Anything).Run(func(args
mock.Arguments) {
- tableName := args.Get(0).(core.Tabler).TableName()
+ tableName := args.Get(0).(dal.Tabler).TableName()
assert.Equal(t, tableName, TestTableNameSrc)
}).Return([]dal.ColumnMeta{}, nil).Once()
@@ -367,7 +367,7 @@ func TestCopyTableColumns_RollBack(t *testing.T) {
// for Primarykey autoincrement cheking
mockDal.On("GetColumns", mock.Anything, mock.Anything).Run(func(args
mock.Arguments) {
- tableName := args.Get(0).(core.Tabler).TableName()
+ tableName := args.Get(0).(dal.Tabler).TableName()
assert.Equal(t, tableName, TestTableNameSrc)
}).Return([]dal.ColumnMeta{}, nil).Once()
diff --git a/helpers/pluginhelper/tap/models.go
b/helpers/pluginhelper/tap/models.go
index 67dcc5731..628f066c1 100644
--- a/helpers/pluginhelper/tap/models.go
+++ b/helpers/pluginhelper/tap/models.go
@@ -20,7 +20,7 @@ package tap
import (
"encoding/json"
"github.com/apache/incubator-devlake/models/migrationscripts/archived"
- "github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"gorm.io/datatypes"
"time"
)
@@ -86,4 +86,4 @@ func ToState(raw *RawState) *State {
}
}
-var _ core.Tabler = (*RawState)(nil)
+var _ dal.Tabler = (*RawState)(nil)
diff --git a/plugins/ae/impl/impl.go b/plugins/ae/impl/impl.go
index 8978ff8e1..e79475e9c 100644
--- a/plugins/ae/impl/impl.go
+++ b/plugins/ae/impl/impl.go
@@ -26,6 +26,7 @@ import (
"github.com/apache/incubator-devlake/plugins/ae/models/migrationscripts"
"github.com/apache/incubator-devlake/plugins/ae/tasks"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
)
@@ -44,8 +45,8 @@ func (plugin AE) Init(basicRes core.BasicRes) errors.Error {
return nil
}
-func (plugin AE) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin AE) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.AECommit{},
&models.AEProject{},
&models.AeConnection{},
diff --git a/plugins/azure/impl/impl.go b/plugins/azure/impl/impl.go
index a7bc49de5..9ef29828a 100644
--- a/plugins/azure/impl/impl.go
+++ b/plugins/azure/impl/impl.go
@@ -26,6 +26,7 @@ import (
"github.com/apache/incubator-devlake/plugins/azure/models/migrationscripts"
"github.com/apache/incubator-devlake/plugins/azure/tasks"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
)
@@ -52,8 +53,8 @@ func (plugin Azure) Init(basicRes core.BasicRes) errors.Error
{
return nil
}
-func (plugin Azure) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Azure) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.AzureBuild{},
&models.AzureBuildDefinition{},
&models.AzureConnection{},
diff --git a/plugins/bitbucket/impl/impl.go b/plugins/bitbucket/impl/impl.go
index 14279749e..54da3c035 100644
--- a/plugins/bitbucket/impl/impl.go
+++ b/plugins/bitbucket/impl/impl.go
@@ -26,6 +26,7 @@ import (
"github.com/apache/incubator-devlake/plugins/bitbucket/models/migrationscripts"
"github.com/apache/incubator-devlake/plugins/bitbucket/tasks"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
)
@@ -45,8 +46,8 @@ func (plugin Bitbucket) Init(basicRes core.BasicRes)
errors.Error {
return nil
}
-func (plugin Bitbucket) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Bitbucket) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.BitbucketConnection{},
&models.BitbucketAccount{},
&models.BitbucketCommit{},
diff --git a/plugins/core/plugin_model.go b/plugins/core/plugin_model.go
index cb0847a5c..836b8af2f 100644
--- a/plugins/core/plugin_model.go
+++ b/plugins/core/plugin_model.go
@@ -17,12 +17,9 @@ limitations under the License.
package core
-// TODO: replace with dal.Tabler
-type Tabler interface {
- TableName() string
-}
+import "github.com/apache/incubator-devlake/plugins/core/dal"
type PluginModel interface {
// This method returns all models of the current plugin
- GetTablesInfo() []Tabler
+ GetTablesInfo() []dal.Tabler
}
diff --git a/plugins/customize/impl/impl.go b/plugins/customize/impl/impl.go
index 6be99337a..3f4d94f5a 100644
--- a/plugins/customize/impl/impl.go
+++ b/plugins/customize/impl/impl.go
@@ -21,6 +21,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/customize/api"
"github.com/apache/incubator-devlake/plugins/customize/tasks"
"github.com/mitchellh/mapstructure"
@@ -40,8 +41,8 @@ func (plugin *Customize) Init(basicRes core.BasicRes)
errors.Error {
return nil
}
-func (plugin Customize) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin Customize) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin Customize) SubTaskMetas() []core.SubTaskMeta {
diff --git a/plugins/dbt/impl/impl.go b/plugins/dbt/impl/impl.go
index 531c16767..f9ccb0605 100644
--- a/plugins/dbt/impl/impl.go
+++ b/plugins/dbt/impl/impl.go
@@ -19,6 +19,7 @@ package impl
import (
"github.com/apache/incubator-devlake/errors"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
"github.com/apache/incubator-devlake/plugins/core"
@@ -44,8 +45,8 @@ func (plugin Dbt) SubTaskMetas() []core.SubTaskMeta {
}
}
-func (plugin Dbt) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin Dbt) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin Dbt) PrepareTaskData(taskCtx core.TaskContext, options
map[string]interface{}) (interface{}, errors.Error) {
diff --git a/plugins/dora/impl/impl.go b/plugins/dora/impl/impl.go
index cd8064362..ebd6b8612 100644
--- a/plugins/dora/impl/impl.go
+++ b/plugins/dora/impl/impl.go
@@ -22,6 +22,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/dora/models/migrationscripts"
"github.com/apache/incubator-devlake/plugins/dora/tasks"
)
@@ -63,8 +64,8 @@ func (plugin Dora) RequiredDataEntities() (data
[]map[string]interface{}, err er
}, nil
}
-func (plugin Dora) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin Dora) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin Dora) IsProjectMetric() bool {
diff --git a/plugins/feishu/impl/impl.go b/plugins/feishu/impl/impl.go
index aa637f7c5..02bb66427 100644
--- a/plugins/feishu/impl/impl.go
+++ b/plugins/feishu/impl/impl.go
@@ -23,6 +23,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/feishu/api"
"github.com/apache/incubator-devlake/plugins/feishu/models"
"github.com/apache/incubator-devlake/plugins/feishu/models/migrationscripts"
@@ -45,8 +46,8 @@ func (plugin Feishu) Init(basicRes core.BasicRes)
errors.Error {
return nil
}
-func (plugin Feishu) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Feishu) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.FeishuConnection{},
&models.FeishuMeetingTopUserItem{},
}
diff --git a/plugins/gitee/impl/impl.go b/plugins/gitee/impl/impl.go
index bd9327cf4..47b5c9833 100644
--- a/plugins/gitee/impl/impl.go
+++ b/plugins/gitee/impl/impl.go
@@ -23,6 +23,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/gitee/api"
"github.com/apache/incubator-devlake/plugins/gitee/models"
"github.com/apache/incubator-devlake/plugins/gitee/models/migrationscripts"
@@ -45,8 +46,8 @@ func (plugin Gitee) Init(basicRes core.BasicRes) errors.Error
{
return nil
}
-func (plugin Gitee) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Gitee) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.GiteeConnection{},
&models.GiteeAccount{},
&models.GiteeCommit{},
diff --git a/plugins/gitextractor/impl/impl.go
b/plugins/gitextractor/impl/impl.go
index 15f9769c0..c9ffee992 100644
--- a/plugins/gitextractor/impl/impl.go
+++ b/plugins/gitextractor/impl/impl.go
@@ -23,6 +23,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/gitextractor/models"
"github.com/apache/incubator-devlake/plugins/gitextractor/parser"
"github.com/apache/incubator-devlake/plugins/gitextractor/store"
@@ -36,8 +37,8 @@ var _ core.PluginModel = (*GitExtractor)(nil)
type GitExtractor struct{}
-func (plugin GitExtractor) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin GitExtractor) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin GitExtractor) Description() string {
diff --git a/plugins/github/impl/impl.go b/plugins/github/impl/impl.go
index e76b2412a..c1867abc8 100644
--- a/plugins/github/impl/impl.go
+++ b/plugins/github/impl/impl.go
@@ -60,8 +60,8 @@ func (plugin Github) Init(basicRes core.BasicRes)
errors.Error {
return nil
}
-func (plugin Github) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Github) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.GithubConnection{},
&models.GithubAccount{},
&models.GithubAccountOrg{},
diff --git a/plugins/github_graphql/impl/impl.go
b/plugins/github_graphql/impl/impl.go
index bf36d3bef..9a988b568 100644
--- a/plugins/github_graphql/impl/impl.go
+++ b/plugins/github_graphql/impl/impl.go
@@ -24,6 +24,7 @@ import (
"strings"
"time"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
githubImpl "github.com/apache/incubator-devlake/plugins/github/impl"
"github.com/apache/incubator-devlake/errors"
@@ -62,8 +63,8 @@ func (plugin GithubGraphql) Description() string {
return "collect some GithubGraphql data"
}
-func (plugin GithubGraphql) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin GithubGraphql) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin GithubGraphql) SubTaskMetas() []core.SubTaskMeta {
diff --git a/plugins/gitlab/impl/impl.go b/plugins/gitlab/impl/impl.go
index 650785910..9f32f8d9b 100644
--- a/plugins/gitlab/impl/impl.go
+++ b/plugins/gitlab/impl/impl.go
@@ -67,8 +67,8 @@ func (plugin Gitlab)
MakeDataSourcePipelinePlanV200(connectionId uint64, scopes
return api.MakePipelinePlanV200(plugin.SubTaskMetas(), connectionId,
scopes, &syncPolicy)
}
-func (plugin Gitlab) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Gitlab) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.GitlabConnection{},
&models.GitlabAccount{},
&models.GitlabCommit{},
diff --git a/plugins/icla/impl/impl.go b/plugins/icla/impl/impl.go
index d2e47aa5f..15b109650 100644
--- a/plugins/icla/impl/impl.go
+++ b/plugins/icla/impl/impl.go
@@ -22,6 +22,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
"github.com/apache/incubator-devlake/plugins/icla/models"
"github.com/apache/incubator-devlake/plugins/icla/models/migrationscripts"
@@ -47,8 +48,8 @@ func (plugin Icla) Init(basicRes core.BasicRes) errors.Error {
return nil
}
-func (plugin Icla) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Icla) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.IclaCommitter{},
}
}
diff --git a/plugins/jenkins/impl/impl.go b/plugins/jenkins/impl/impl.go
index 7efda62d0..3fb760526 100644
--- a/plugins/jenkins/impl/impl.go
+++ b/plugins/jenkins/impl/impl.go
@@ -61,8 +61,8 @@ func (plugin Jenkins) TransformationRule() interface{} {
return &models.JenkinsTransformationRule{}
}
-func (plugin Jenkins) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Jenkins) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.JenkinsBuild{},
&models.JenkinsBuildCommit{},
&models.JenkinsConnection{},
diff --git a/plugins/jira/impl/impl.go b/plugins/jira/impl/impl.go
index 7ce326c93..4ad750086 100644
--- a/plugins/jira/impl/impl.go
+++ b/plugins/jira/impl/impl.go
@@ -63,8 +63,8 @@ func (plugin *Jira) Init(basicRes core.BasicRes) errors.Error
{
return nil
}
-func (plugin Jira) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Jira) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.ApiMyselfResponse{},
&models.JiraAccount{},
&models.JiraBoard{},
diff --git a/plugins/org/impl/impl.go b/plugins/org/impl/impl.go
index 902eca8f1..876a7a028 100644
--- a/plugins/org/impl/impl.go
+++ b/plugins/org/impl/impl.go
@@ -20,6 +20,7 @@ package impl
import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
"github.com/apache/incubator-devlake/plugins/org/api"
"github.com/apache/incubator-devlake/plugins/org/tasks"
@@ -39,8 +40,8 @@ func (plugin *Org) Init(basicRes core.BasicRes) errors.Error {
return nil
}
-func (plugin Org) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin Org) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin Org) Description() string {
diff --git a/plugins/refdiff/impl/impl.go b/plugins/refdiff/impl/impl.go
index c81bc137f..b12ffc07b 100644
--- a/plugins/refdiff/impl/impl.go
+++ b/plugins/refdiff/impl/impl.go
@@ -20,6 +20,7 @@ package impl
import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
"github.com/apache/incubator-devlake/plugins/refdiff/tasks"
)
@@ -44,8 +45,8 @@ func (plugin RefDiff) RequiredDataEntities() (data
[]map[string]interface{}, err
return []map[string]interface{}{}, nil
}
-func (plugin RefDiff) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin RefDiff) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin RefDiff) IsProjectMetric() bool {
diff --git a/plugins/starrocks/impl/impl.go b/plugins/starrocks/impl/impl.go
index 7d99cdf61..57e2632d2 100644
--- a/plugins/starrocks/impl/impl.go
+++ b/plugins/starrocks/impl/impl.go
@@ -20,6 +20,7 @@ package impl
import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
"github.com/apache/incubator-devlake/plugins/starrocks/tasks"
)
@@ -49,8 +50,8 @@ func (s StarRocks) PrepareTaskData(taskCtx core.TaskContext,
options map[string]
return &op, nil
}
-func (s StarRocks) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (s StarRocks) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (s StarRocks) Description() string {
diff --git a/plugins/tapd/impl/impl.go b/plugins/tapd/impl/impl.go
index a29cdb46d..ebfdc7dba 100644
--- a/plugins/tapd/impl/impl.go
+++ b/plugins/tapd/impl/impl.go
@@ -24,6 +24,7 @@ import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/helper"
"github.com/apache/incubator-devlake/plugins/tapd/api"
"github.com/apache/incubator-devlake/plugins/tapd/models"
@@ -46,8 +47,8 @@ func (plugin Tapd) Init(basicRes core.BasicRes) errors.Error {
return nil
}
-func (plugin Tapd) GetTablesInfo() []core.Tabler {
- return []core.Tabler{
+func (plugin Tapd) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{
&models.TapdAccount{},
&models.TapdBug{},
&models.TapdBugChangelog{},
diff --git a/plugins/webhook/impl/impl.go b/plugins/webhook/impl/impl.go
index 9cbd822a1..b6506b793 100644
--- a/plugins/webhook/impl/impl.go
+++ b/plugins/webhook/impl/impl.go
@@ -20,6 +20,7 @@ package impl
import (
"github.com/apache/incubator-devlake/errors"
"github.com/apache/incubator-devlake/plugins/core"
+ "github.com/apache/incubator-devlake/plugins/core/dal"
"github.com/apache/incubator-devlake/plugins/webhook/api"
"github.com/apache/incubator-devlake/plugins/webhook/models/migrationscripts"
)
@@ -42,8 +43,8 @@ func (plugin Webhook) Init(basicRes core.BasicRes)
errors.Error {
return nil
}
-func (plugin Webhook) GetTablesInfo() []core.Tabler {
- return []core.Tabler{}
+func (plugin Webhook) GetTablesInfo() []dal.Tabler {
+ return []dal.Tabler{}
}
func (plugin Webhook) MakeDataSourcePipelinePlanV200(connectionId uint64, _
[]*core.BlueprintScopeV200, _ core.BlueprintSyncPolicy) (pp core.PipelinePlan,
sc []core.Scope, err errors.Error) {
