Merge pull request #234 from felixgunawan/b_fix_null_error_sql

bugfix: sql null column error
tmc · Aug 11, 2023 · 4d6b7ab · 4d6b7ab
2 parents 6f9f536 + df2bf2c
commit 4d6b7ab
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 3 deletions.
diff --git a/tools/sqldatabase/mysql/mysql.go b/tools/sqldatabase/mysql/mysql.go
@@ -57,14 +57,18 @@ func (m MySQL) Query(ctx context.Context, query string, args ...any) ([]string,
 	results := make([][]string, 0)
 	for rows.Next() {
 		row := make([]string, len(cols))
+		rowNullable := make([]sql.NullString, len(cols))
 		rowPtrs := make([]interface{}, len(cols))
 		for i := range row {
-			rowPtrs[i] = &row[i]
+			rowPtrs[i] = &rowNullable[i]
 		}
 		err = rows.Scan(rowPtrs...)
 		if err != nil {
 			return nil, nil, err
 		}
+		for i := range rowNullable {
+			row[i] = rowNullable[i].String
+		}
 		results = append(results, row)
 	}
 	return cols, results, nil

diff --git a/tools/sqldatabase/mysql/mysql_test.go b/tools/sqldatabase/mysql/mysql_test.go
@@ -2,6 +2,9 @@ package mysql_test
 
 import (
 	"context"
+	"database/sql"
+	"errors"
+	"fmt"
 	"os"
 	"testing"
 
@@ -28,4 +31,14 @@ func Test(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Log(desc)
+
+	for _, tableName := range tbs {
+		_, err = db.Query(context.Background(), fmt.Sprintf("SELECT * from %s LIMIT 1", tableName))
+		/* exclude no row error,
+		since we only need to check if db.Query function can perform query correctly*/
+		if errors.Is(err, sql.ErrNoRows) {
+			continue
+		}
+		require.NoError(t, err)
+	}
 }
diff --git a/tools/sqldatabase/postgresql/postgresql.go b/tools/sqldatabase/postgresql/postgresql.go
@@ -64,14 +64,18 @@ func (p PostgreSQL) Query(ctx context.Context, query string, args ...any) ([]str
 	results := make([][]string, 0)
 	for rows.Next() {
 		row := make([]string, len(cols))
+		rowNullable := make([]sql.NullString, len(cols))
 		rowPtrs := make([]interface{}, len(cols))
 		for i := range row {
-			rowPtrs[i] = &row[i]
+			rowPtrs[i] = &rowNullable[i]
 		}
 		err = rows.Scan(rowPtrs...)
 		if err != nil {
 			return nil, nil, err
 		}
+		for i := range rowNullable {
+			row[i] = rowNullable[i].String
+		}
 		results = append(results, row)
 	}
 	return cols, results, nil

diff --git a/tools/sqldatabase/postgresql/postgresql_test.go b/tools/sqldatabase/postgresql/postgresql_test.go
@@ -2,6 +2,9 @@ package postgresql_test
 
 import (
 	"context"
+	"database/sql"
+	"errors"
+	"fmt"
 	"os"
 	"testing"
 
@@ -27,4 +30,14 @@ func Test(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Log(desc)
+
+	for _, tableName := range tbs {
+		_, err = db.Query(context.Background(), fmt.Sprintf("SELECT * from %s LIMIT 1", tableName))
+		/* exclude no row error,
+		since we only need to check if db.Query function can perform query correctly*/
+		if errors.Is(err, sql.ErrNoRows) {
+			continue
+		}
+		require.NoError(t, err)
+	}
 }
diff --git a/tools/sqldatabase/sqlite3/sqlite3.go b/tools/sqldatabase/sqlite3/sqlite3.go
@@ -56,14 +56,18 @@ func (m SQLite3) Query(ctx context.Context, query string, args ...any) ([]string
 	results := make([][]string, 0)
 	for rows.Next() {
 		row := make([]string, len(cols))
+		rowNullable := make([]sql.NullString, len(cols))
 		rowPtrs := make([]interface{}, len(cols))
 		for i := range row {
-			rowPtrs[i] = &row[i]
+			rowPtrs[i] = &rowNullable[i]
 		}
 		err = rows.Scan(rowPtrs...)
 		if err != nil {
 			return nil, nil, err
 		}
+		for i := range rowNullable {
+			row[i] = rowNullable[i].String
+		}
 		results = append(results, row)
 	}
 	return cols, results, nil

diff --git a/tools/sqldatabase/sqlite3/sqlite3_test.go b/tools/sqldatabase/sqlite3/sqlite3_test.go
@@ -3,6 +3,8 @@ package sqlite3_test
 import (
 	"context"
 	"database/sql"
+	"errors"
+	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -46,4 +48,14 @@ func Test(t *testing.T) {
 	require.True(t, strings.Contains(desc, "Activity"))       //nolint:stylecheck
 	require.True(t, strings.Contains(desc, "Activity1"))      //nolint:stylecheck
 	require.True(t, strings.Contains(desc, "Activity2"))      //nolint:stylecheck
+
+	for _, tableName := range tbs {
+		_, err = db.Query(context.Background(), fmt.Sprintf("SELECT * from %s LIMIT 1", tableName))
+		/* exclude no row error,
+		since we only need to check if db.Query function can perform query correctly*/
+		if errors.Is(err, sql.ErrNoRows) {
+			continue
+		}
+		require.NoError(t, err)
+	}
 }