MaxJSONSize and MaxXMLSize must be greater than zero

.github/workflows/tests.yml

@@ -5,18 +5,19 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  workflow_dispatch:
 
 jobs:
 
   audit:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Verify dependencies
         run: go mod verify
@@ -37,4 +38,7 @@ jobs:
         run: golint ./...
 
       - name: Run tests
-        run: go test -race -vet=off ./...
+        run: go test -race -vet=off ./...
+
+      - name: Update coverage report
+        uses: ncruces/go-coverage-report@main

go.mod

@@ -1,7 +1,3 @@
 module github.com/tsawler/toolbox
 
-go 1.18
-
-require github.com/gabriel-vasile/mimetype v1.4.0
-
-require golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
+go 1.19

go.sum

@@ -1,11 +0,0 @@
-github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
-github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

load_sql.go

@@ -0,0 +1,78 @@
+package toolbox
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+)
+
+// LoadSQLQueries loads SQL queries from a file and populates the QUERY map.
+// This tool aims to facilitate the use of the go language's database/sql standard library.
+// Writing SQL queries directly in the code can make it messy, so writing SQL queries in .sql files
+// and then calling them from the code helps prevent code clutter,
+// allowing SQL queries to be centralized in one place for better organization.
+func (t *Tools) LoadSQLQueries(fileName string) (map[string]string, error) {
+	query := make(map[string]string)
+
+	file, err := os.Open(fileName)
+	if err != nil {
+		return query, err
+	}
+	defer func() {
+		_ = file.Close()
+	}()
+
+	query, err = parseSQLQueries(file, query)
+	return query, err
+}
+
+// parseSQLQueries reads the SQL queries from the provided file and populates the QUERY map.
+func parseSQLQueries(file *os.File, query map[string]string) (map[string]string, error) {
+	scanner := bufio.NewScanner(file)
+	var key string
+	var queryBuilder strings.Builder
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		if isSQLQuery(line) || len(key) > 0 {
+			if len(key) > 0 {
+				if strings.HasSuffix(line, ";") {
+					queryBuilder.WriteString(line)
+					query[key] = queryBuilder.String()
+					key, queryBuilder = "", strings.Builder{}
+				} else {
+					queryBuilder.WriteString(line + " ")
+				}
+			} else {
+				key = extractKey(line)
+			}
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		return query, fmt.Errorf("error reading file: %w", err)
+	}
+	return query, nil
+}
+
+// isSQLQuery checks if the given line is an SQL query or a comment.
+func isSQLQuery(line string) bool {
+	return hasPrefixInList(line, []string{"-- ", "SELECT", "INSERT", "UPDATE", "DELETE"})
+}
+
+// extractKey extracts the key from the comment line.
+func extractKey(line string) string {
+	if strings.HasPrefix(line, "-- ") {
+		return strings.Split(line, "-- ")[1]
+	}
+	return ""
+}
+
+// hasPrefixInList is a prefix checker
+func hasPrefixInList(str string, prefixes []string) bool {
+	for _, prefix := range prefixes {
+		if strings.HasPrefix(str, prefix) {
+			return true
+		}
+	}
+	return false
+}

load_sql_test.go

@@ -0,0 +1,100 @@
+package toolbox
+
+import (
+	"os"
+	"strconv"
+	"strings"
+	"testing"
+)
+
+var tools Tools
+
+func TestLoadSQLQueries(t *testing.T) {
+	tests := []struct {
+		fileName string
+		key      string
+		value    string
+		equal    bool
+		err      bool
+	}{
+		{fileName: "./testdata/not.sql", key: "", value: "", equal: true, err: true},
+		{fileName: "./testdata/not.sql", key: "not", value: "", equal: true, err: true},
+		{fileName: "./testdata/not.sql", key: "not", value: "equal", equal: false, err: true},
+		{fileName: "./testdata/test.sql", key: "TEST1", value: "WHERE ass.id=$1;", equal: true, err: false},
+		{fileName: "./testdata/test.sql", key: "TEST1", value: "WHERE ass.id=$1", equal: false, err: false},
+		{fileName: "./testdata/test.sql", key: "TEST2", value: "id = $1;", equal: true, err: false},
+	}
+	for i, tt := range tests {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			query, err := tools.LoadSQLQueries(tt.fileName)
+			if (err != nil) != tt.err {
+				t.Errorf("LoadSQLQueries() error: %v, except: %v", err, tt.err)
+			}
+			if strings.HasSuffix(query[tt.key], tt.value) != tt.equal {
+				t.Errorf("LoadSQLQueries() error: %v, except: %v", err, tt.equal)
+			}
+		})
+	}
+}
+
+func TestParseSQLQueries(t *testing.T) {
+	file, err := os.Open("./testdata/test.sql")
+	defer func(file *os.File) {
+		_ = file.Close()
+	}(file)
+	if (err != nil) != false {
+		t.Errorf("File Open result: %v, expect: %v", false, true)
+	}
+	_, err = parseSQLQueries(file, make(map[string]string))
+	if (err != nil) != false {
+		t.Errorf("parseSQLQueries() result: %v, expect: %v", false, true)
+	}
+}
+
+func TestIsSQLQuery(t *testing.T) {
+	if result := isSQLQuery("-- "); result != true {
+		t.Errorf("isSQLQuery() result: %v, expect: %v", result, true)
+	}
+	if result := isSQLQuery("--"); result != false {
+		t.Errorf("isSQLQuery() result: %v, expect: %v", result, false)
+	}
+}
+
+func TestExtractKey(t *testing.T) {
+	tests := []struct {
+		value  string
+		expect string
+	}{
+		{value: "-- ABC", expect: "ABC"},
+		{value: "DEF", expect: ""},
+	}
+	for i, tt := range tests {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			if result := extractKey(tt.value); result != tt.expect {
+				t.Errorf("extractKey() result: %v, expect: %v", result, tt.expect)
+			}
+		})
+	}
+}
+
+func TestHasPrefixInList(t *testing.T) {
+	type args struct {
+		key   string
+		value []string
+	}
+	tests := []struct {
+		args   args
+		expect bool
+	}{
+		{args: args{key: "abc"}, expect: false},
+		{args: args{key: "abc", value: []string{"abc", "def"}}, expect: true},
+		{args: args{key: "xyz", value: []string{"abc", "def"}}, expect: false},
+	}
+	for i, tt := range tests {
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			if result := hasPrefixInList(tt.args.key, tt.args.value); result != tt.expect {
+				t.Errorf("hasPrefixInList() result: %v, expect: %v", result, tt.expect)
+			}
+		})
+	}
+}