Skip to content

fix: recover from driver panic on GEOGRAPHY/GEOMETRY columns #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlevy-msft-sql wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −1
Open

fix: recover from driver panic on GEOGRAPHY/GEOMETRY columns #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/sqlcmd/sqlcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,18 @@ func (s *Sqlcmd) getRunnableQuery(q string) string {
return b.String()
}

// safeColumnTypes wraps rows.ColumnTypes() with panic recovery.
// The go-mssqldb driver panics for unsupported types like GEOGRAPHY/GEOMETRY (type 240).
func safeColumnTypes(rows *sql.Rows) (cols []*sql.ColumnType, err error) {
defer func() {
if r := recover(); r != nil {
err = localizer.Errorf("unsupported column type: %v", r)
cols = nil
}
}()
return rows.ColumnTypes()
}

// runQuery runs the query and prints the results
// The return value is based on the first cell of the last column of the last result set.
// If it's numeric, it will be converted to int
Expand Down Expand Up @@ -476,7 +488,7 @@ func (s *Sqlcmd) runQuery(query string) (int, error) {
case sqlexp.MsgNext:
if first {
first = false
cols, err = rows.ColumnTypes()
cols, err = safeColumnTypes(rows)
if err != nil {
retcode = -100
qe = s.handleError(&retcode, err)
Expand Down
9 changes: 9 additions & 0 deletions pkg/sqlcmd/sqlcmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,3 +705,12 @@ func TestSqlcmdPrefersSharedMemoryProtocol(t *testing.T) {
assert.EqualValuesf(t, "np", msdsn.ProtocolParsers[3].Protocol(), "np should be fourth protocol")

}

func TestSafeColumnTypesRecoversPanic(t *testing.T) {
// A nil *sql.Rows will panic when ColumnTypes() is called.
// safeColumnTypes should recover and return an error instead.
var rows *sql.Rows
cols, err := safeColumnTypes(rows)
assert.Nil(t, cols)
assert.Error(t, err)
}
Loading