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
commit f2255fd49028b93984f44411e9080b90bd7f0021 Author: linyh <[email protected]> AuthorDate: Wed Jun 15 12:20:39 2022 +0800 change name for flush name --- helpers/e2ehelper/data_flow_tester.go | 38 +++++++++++++++-------------------- plugins/gitlab/e2e/project_test.go | 7 +++---- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/helpers/e2ehelper/data_flow_tester.go b/helpers/e2ehelper/data_flow_tester.go index ab85a7ad..ccd32fb9 100644 --- a/helpers/e2ehelper/data_flow_tester.go +++ b/helpers/e2ehelper/data_flow_tester.go @@ -92,16 +92,11 @@ func NewDataFlowTester(t *testing.T, pluginName string, pluginMeta core.PluginMe } } -// ImportCsv imports records from specified csv file into target table, note that existing data would be deleted first. -func (t *DataFlowTester) ImportCsv(csvRelPath string, tableName string) { +// ImportCsvIntoRawTable imports records from specified csv file into target table, note that existing data would be deleted first. +func (t *DataFlowTester) ImportCsvIntoRawTable(csvRelPath string, tableName string) { csvIter := pluginhelper.NewCsvFileIterator(csvRelPath) defer csvIter.Close() - // create table if not exists - err := t.Db.Table(tableName).AutoMigrate(&helper.RawData{}) - if err != nil { - panic(err) - } - t.MigrateRawTableAndFlush(tableName) + t.FlushRawTable(tableName) // load rows and insert into target table for csvIter.HasNext() { toInsertValues := csvIter.Fetch() @@ -117,36 +112,35 @@ func (t *DataFlowTester) ImportCsv(csvRelPath string, tableName string) { } } -// MigrateTableAndFlush migrate table and deletes all records from specified table -func (t *DataFlowTester) MigrateRawTableAndFlush(rawRableName string) { +// MigrateRawTableAndFlush migrate table and deletes all records from specified table +func (t *DataFlowTester) FlushRawTable(rawTableName string) { // flush target table - err := t.Db.Table(rawRableName).AutoMigrate(&helper.RawData{}) + err := t.Db.Migrator().DropTable(rawTableName) + if err != nil { + panic(err) + } + err = t.Db.Table(rawTableName).AutoMigrate(&helper.RawData{}) if err != nil { panic(err) } - err = t.Db.Exec(fmt.Sprintf("DELETE FROM %s", rawRableName)).Error + err = t.Db.Exec(fmt.Sprintf("DELETE FROM %s", rawTableName)).Error if err != nil { panic(err) } } -// MigrateTableAndFlush migrate table and deletes all records from specified table -func (t *DataFlowTester) MigrateTableAndFlush(dst schema.Tabler) { +// FlushTabler migrate table and deletes all records from specified table +func (t *DataFlowTester) FlushTabler(dst schema.Tabler) { // flush target table - err := t.Db.AutoMigrate(dst) + err := t.Db.Migrator().DropTable(dst) if err != nil { panic(err) } - err = t.Db.Delete(dst, `true`).Error + err = t.Db.AutoMigrate(dst) if err != nil { panic(err) } -} - -// FlushTable deletes all records from specified table -func (t *DataFlowTester) FlushTable(tableName string) { - // flush target table - err := t.Db.Exec(fmt.Sprintf("DELETE FROM %s", tableName)).Error + err = t.Db.Delete(dst, `true`).Error if err != nil { panic(err) } diff --git a/plugins/gitlab/e2e/project_test.go b/plugins/gitlab/e2e/project_test.go index 7e12c03e..e25461be 100644 --- a/plugins/gitlab/e2e/project_test.go +++ b/plugins/gitlab/e2e/project_test.go @@ -40,11 +40,10 @@ func TestGitlabDataFlow(t *testing.T) { } // import raw data table - dataflowTester.MigrateRawTableAndFlush("_raw_gitlab_api_project") - dataflowTester.ImportCsv("./tables/_raw_gitlab_api_projects.csv", "_raw_gitlab_api_project") + dataflowTester.ImportCsvIntoRawTable("./tables/_raw_gitlab_api_projects.csv", "_raw_gitlab_api_project") // verify extraction - dataflowTester.MigrateTableAndFlush(&models.GitlabProject{}) + dataflowTester.FlushTabler(&models.GitlabProject{}) dataflowTester.Subtask(tasks.ExtractProjectMeta, taskData) dataflowTester.CreateSnapshotOrVerify( models.GitlabProject{}, @@ -72,7 +71,7 @@ func TestGitlabDataFlow(t *testing.T) { ) // verify conversion - dataflowTester.MigrateTableAndFlush(&code.Repo{}) + dataflowTester.FlushTabler(&code.Repo{}) dataflowTester.Subtask(tasks.ConvertProjectMeta, taskData) dataflowTester.CreateSnapshotOrVerify( code.Repo{},
