Merge pull request #257 from noborus/refactor-1

Minor refactoring
noborus · Nov 10, 2023 · b805621 · b805621
2 parents 9ed6c16 + ea3375c
commit b805621
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1085,8 +1085,7 @@ func main() {
                 trdsql.NewImporter(trdsql.InDelimiter(":")),
                 trdsql.NewExporter(trdsql.NewWriter()),
         )
-        err := trd.Exec("SELECT c1 FROM /etc/passwd")
-        if err != nil {
+        if err := trd.Exec("SELECT c1 FROM /etc/passwd"); err != nil {
                 log.Fatal(err)
         }
 }

diff --git a/_example/simple/main.go b/_example/simple/main.go
@@ -12,8 +12,7 @@ func main() {
 		trdsql.NewImporter(trdsql.InDelimiter(":")),
 		trdsql.NewExporter(trdsql.NewWriter()),
 	)
-	err := trd.Exec("SELECT c1 FROM /etc/passwd")
-	if err != nil {
+	if err := trd.Exec("SELECT c1 FROM /etc/passwd"); err != nil {
 		log.Fatal(err)
 	}
 }
diff --git a/importer_buffer.go b/importer_buffer.go
@@ -44,5 +44,5 @@ func (i *BufferImporter) ImportContext(ctx context.Context, db *DB, query string
 	if err := db.CreateTable(i.tableName, names, types, true); err != nil {
 		return query, err
 	}
-	return query, db.Import(i.tableName, names, i.Reader)
+	return query, db.ImportContext(ctx, i.tableName, names, i.Reader)
 }
diff --git a/importer_slice.go b/importer_slice.go
@@ -36,5 +36,5 @@ func (i *SliceImporter) ImportContext(ctx context.Context, db *DB, query string)
 	if err := db.CreateTable(i.tableName, names, types, true); err != nil {
 		return query, err
 	}
-	return query, db.Import(i.tableName, names, i.SliceReader)
+	return query, db.ImportContext(ctx, i.tableName, names, i.SliceReader)
 }
diff --git a/output_raw.go b/output_raw.go
@@ -17,13 +17,14 @@ type RAWWriter struct {
 
 // NewRAWWriter returns RAWWriter.
 func NewRAWWriter(writeOpts *WriteOpts) *RAWWriter {
-	var err error
-	w := &RAWWriter{}
-	w.writer = bufio.NewWriter(writeOpts.OutStream)
-	w.delimiter, err = strconv.Unquote(`"` + writeOpts.OutDelimiter + `"`)
+	delimiter, err := strconv.Unquote(`"` + writeOpts.OutDelimiter + `"`)
 	if err != nil {
 		debug.Printf("%s\n", err)
 	}
+
+	w := &RAWWriter{}
+	w.writer = bufio.NewWriter(writeOpts.OutStream)
+	w.delimiter = delimiter
 	w.outHeader = writeOpts.OutHeader
 	if writeOpts.OutUseCRLF {
 		w.endLine = "\r\n"

diff --git a/reader.go b/reader.go
@@ -51,8 +51,12 @@ var readerFuncs = map[Format]ReaderFunc{
 	},
 }
 
-var extFormat Format = 100
-var registerMux = &sync.Mutex{}
+var (
+	// extFormat is the next format number to be assigned.
+	extFormat Format = 100
+	// registerMux is a mutex to protect access to the register.
+	registerMux = &sync.Mutex{}
+)
 
 func RegisterReaderFunc(ext string, readerFunc ReaderFunc) {
 	registerMux.Lock()

diff --git a/strings.go b/strings.go
@@ -9,7 +9,7 @@ import (
 )
 
 // ValString converts database value to string.
-func ValString(v interface{}) string {
+func ValString(v any) string {
 	switch t := v.(type) {
 	case nil:
 		return ""
@@ -33,7 +33,7 @@ func ValString(v interface{}) string {
 	}
 }
 
-func replaceNULL(nullString string, v interface{}) interface{} {
+func replaceNULL(nullString string, v any) any {
 	switch t := v.(type) {
 	case nil:
 		return nil

diff --git a/strings_test.go b/strings_test.go
@@ -8,7 +8,7 @@ import (
 
 func TestValString(t *testing.T) {
 	type args struct {
-		v interface{}
+		v any
 	}
 	tests := []struct {
 		name string
@@ -53,21 +53,21 @@ func TestValString(t *testing.T) {
 func Test_replaceNULL(t *testing.T) {
 	type args struct {
 		NULLString string
-		v          interface{}
+		v          any
 	}
 	tests := []struct {
 		name string
 		args args
-		want interface{}
+		want any
 	}{
 		{
 			name: "test1",
-			args: args{NULLString: "NULL", v: interface{}("N")},
+			args: args{NULLString: "NULL", v: any("N")},
 			want: "N",
 		},
 		{
 			name: "testMatch",
-			args: args{NULLString: "NULL", v: interface{}("NULL")},
+			args: args{NULLString: "NULL", v: any("NULL")},
 			want: nil,
 		},
 		{