From 87de544ebd1eb937c65462b8c9a40f7d1c3bddfd Mon Sep 17 00:00:00 2001
From: guoguangwu <guoguangwu@magic-shield.com>
Date: Sun, 22 Oct 2023 13:08:01 +0800
Subject: [PATCH] chore: pkg import only once

---
 driver/mysql/base/utils.go                  | 3 +--
 driver/mysql/inspect.go                     | 3 +--
 driver/oracle/extractor/extractor_oracle.go | 5 ++---
 driver/oracle/extractor/log_miner.go        | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/driver/mysql/base/utils.go b/driver/mysql/base/utils.go
index ab30b8d7b..ff8ce4dbd 100644
--- a/driver/mysql/base/utils.go
+++ b/driver/mysql/base/utils.go
@@ -9,7 +9,6 @@ package base
 import (
 	"bytes"
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"github.com/hashicorp/go-hclog"
 	"github.com/pingcap/tidb/types"
@@ -146,7 +145,7 @@ func ShowCreateTable(db usql.QueryAble, databaseName, tableName string) (stateme
 	return createTableStatement, err
 }
 
-func ShowCreateView(db *gosql.DB, databaseName, tableName string, dropTableIfExists bool) (createTableStatement string, err error) {
+func ShowCreateView(db *sql.DB, databaseName, tableName string, dropTableIfExists bool) (createTableStatement string, err error) {
 	var dummy, character_set_client, collation_connection string
 	query := fmt.Sprintf(`show create table %s.%s`, umconf.EscapeName(databaseName), umconf.EscapeName(tableName))
 	err = db.QueryRow(query).Scan(&dummy, &createTableStatement, &character_set_client, &collation_connection)
diff --git a/driver/mysql/inspect.go b/driver/mysql/inspect.go
index 2f8013092..44246a75e 100644
--- a/driver/mysql/inspect.go
+++ b/driver/mysql/inspect.go
@@ -17,7 +17,6 @@ import (
 	"github.com/actiontech/dtle/driver/common"
 
 	ubase "github.com/actiontech/dtle/driver/mysql/base"
-	uconf "github.com/actiontech/dtle/driver/mysql/mysqlconfig"
 	umconf "github.com/actiontech/dtle/driver/mysql/mysqlconfig"
 	usql "github.com/actiontech/dtle/driver/mysql/sql"
 	hclog "github.com/hashicorp/go-hclog"
@@ -101,7 +100,7 @@ func (i *Inspector) ValidateOriginalTable(databaseName, tableName string, table
 		return err
 	}
 	// TODO why assign OriginalTableColumns twice (later getSchemaTablesAndMeta->readTableColumns)?
-	table.ColumnMap, err = uconf.BuildColumnMapIndex(table.ColumnMapFrom, table.OriginalTableColumns.Ordinals)
+	table.ColumnMap, err = umconf.BuildColumnMapIndex(table.ColumnMapFrom, table.OriginalTableColumns.Ordinals)
 	if err != nil {
 		return err
 	}
diff --git a/driver/oracle/extractor/extractor_oracle.go b/driver/oracle/extractor/extractor_oracle.go
index 20ff27627..a44d7aa8a 100644
--- a/driver/oracle/extractor/extractor_oracle.go
+++ b/driver/oracle/extractor/extractor_oracle.go
@@ -9,7 +9,6 @@ package extractor
 import (
 	"context"
 	"database/sql"
-	gosql "database/sql"
 	"encoding/binary"
 	"fmt"
 	"math"
@@ -61,8 +60,8 @@ type ExtractorOracle struct {
 
 	mysqlVersionDigit int
 	oracleDB          *config.OracleDB
-	db                *gosql.DB
-	singletonDB       *gosql.DB
+	db                *sql.DB
+	singletonDB       *sql.DB
 	//dumpers           []*mysql.dumper
 	// db.tb exists when creating the job, for full-copy.
 	// vs e.mysqlContext.ReplicateDoDb: all user assigned db.tb
diff --git a/driver/oracle/extractor/log_miner.go b/driver/oracle/extractor/log_miner.go
index 8d29ae727..6e683bcc9 100644
--- a/driver/oracle/extractor/log_miner.go
+++ b/driver/oracle/extractor/log_miner.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"crypto/md5"
 	"database/sql"
-	gosql "database/sql"
 	"encoding/hex"
 	"fmt"
 	"regexp"
@@ -1320,7 +1319,7 @@ func findTableConfig(schema *common.DataSource, tableName string) *common.Table
 	return loadTableConfig(schema, tableName)
 }
 
-func Query(db *gosql.DB, querySQL string, args ...interface{}) ([]map[string]string, error) {
+func Query(db *sql.DB, querySQL string, args ...interface{}) ([]map[string]string, error) {
 	var (
 		cols []string
 		res  []map[string]string