Skip to content

Commit 271d482

Browse files
committed
refactor: remove unused git related code to simplify logic
1 parent 1b2577a commit 271d482

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

sqle/api/controller/v1/sql_audit_record.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"strings"
1515
"time"
1616

17-
"github.com/go-git/go-git/v5/plumbing"
18-
1917
javaParser "github.com/actiontech/java-sql-extractor/parser"
2018
xmlParser "github.com/actiontech/mybatis-mapper-2-sql"
2119
"github.com/actiontech/sqle/sqle/api/controller"
@@ -28,7 +26,6 @@ import (
2826
"github.com/actiontech/sqle/sqle/model"
2927
"github.com/actiontech/sqle/sqle/server"
3028
"github.com/actiontech/sqle/sqle/utils"
31-
goGit "github.com/go-git/go-git/v5"
3229
"github.com/labstack/echo/v4"
3330
)
3431

@@ -442,28 +439,14 @@ func parseXMLsWithFilePath(xmlContents []xmlParser.XmlFile) ([]SQLFromXML, error
442439
// todo 此处跳过了不支持的编码格式文件
443440
func getSqlsFromGit(c echo.Context) (sqlsFromSQLFiles, sqlsFromJavaFiles []SQLsFromSQLFile, sqlsFromXMLs []SQLFromXML, exist bool, err error) {
444441
// clone from git
445-
repository, directory, cleanup, err := CloneGitRepository(c.Request().Context(), c.FormValue(GitHttpURL), c.FormValue(GitUserName), c.FormValue(GitPassword), c.FormValue(GitBranchName))
442+
_, directory, cleanup, err := CloneGitRepository(c.Request().Context(), c.FormValue(GitHttpURL), c.FormValue(GitUserName), c.FormValue(GitPassword), c.FormValue(GitBranchName))
446443
if err != nil {
447444
return nil, nil, nil, false, err
448445
}
449446
defer func() {
450447
cleanupError := cleanup()
451448
c.Logger().Errorf("cleanup git repository failed, err: %v", cleanupError)
452449
}()
453-
workTree, err := repository.Worktree()
454-
if err != nil {
455-
return nil, nil, nil, false, err
456-
}
457-
branch := c.FormValue(GitBranchName)
458-
if branch != "" {
459-
err = workTree.Checkout(&goGit.CheckoutOptions{
460-
Branch: plumbing.NewRemoteReferenceName("", branch),
461-
Create: false,
462-
})
463-
if err != nil {
464-
return nil, nil, nil, false, err
465-
}
466-
}
467450
l := log.NewEntry().WithField("function", "getSqlsFromGit")
468451
var xmlContents []xmlParser.XmlFile
469452
// traverse the repository, parse and put SQL into sqlBuffer

0 commit comments

Comments
 (0)