Skip to content
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

Support for UDT (hierarchyid, geometry and geography) #216

Merged
merged 9 commits into from
Aug 22, 2024
Merged

Support for UDT (hierarchyid, geometry and geography) #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c7f6524
Accept hierarchyid as a valid type
tentone Aug 20, 2024
93d012f
error
tentone Aug 20, 2024
59c91d4
derp
tentone Aug 20, 2024
194f006
geography and geometry
tentone Aug 20, 2024
e29c4cf
Return value
tentone Aug 20, 2024
a6fd3eb
Tests
tentone Aug 21, 2024
1d05776
Typo
tentone Aug 21, 2024
2b6ac51
Upper
tentone Aug 21, 2024
f7bf2e8
hasSize
tentone Aug 21, 2024
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
4 changes: 4 additions & 0 deletions queries_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func TestSelect(t *testing.T) {
{"cast(cast('abc' as varchar(3)) as sql_variant)", "abc"},
{"cast(cast('abc' as char(3)) as sql_variant)", "abc"},
{"cast(N'abc' as sql_variant)", "abc"},
{"cast('/' as hierarchyid)", []byte{}},
}

for _, test := range values {
Expand Down Expand Up @@ -1682,6 +1683,9 @@ func TestColumnTypeIntrospection(t *testing.T) {
{"cast('abc' as char(3))", "CHAR", reflect.TypeOf(""), true, 3, false, 0, 0},
{"cast(N'abc' as nchar(3))", "NCHAR", reflect.TypeOf(""), true, 3, false, 0, 0},
{"cast(1 as sql_variant)", "SQL_VARIANT", reflect.TypeOf(nil), false, 0, false, 0, 0},
{"geometry::STGeomFromText('LINESTRING (100 100, 20 180, 180 180)', 0)", "GEOMETRY", reflect.TypeOf([]byte{}), true, 2147483647, false, 0, 0},
{"geography::STGeomFromText('LINESTRING(-122.360 47.656, -122.343 47.656 )', 4326)", "GEOGRAPHY", reflect.TypeOf([]byte{}), false, 2147483647, false, 0, 0},
{"cast('/1/2/3/' as hierarchyid)", "HIERARCHYID", reflect.TypeOf([]byte{}), true, 892, false, 0, 0},
}
conn, logger := open(t)
defer conn.Close()
Expand Down
20 changes: 20 additions & 0 deletions types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"math"
"reflect"
"strconv"
"strings"
"time"

"github.com/microsoft/go-mssqldb/internal/cp"
Expand Down Expand Up @@ -1137,6 +1138,8 @@ func makeGoLangScanType(ti typeInfo) reflect.Type {
return reflect.TypeOf([]byte{})
case typeVariant:
return reflect.TypeOf(nil)
case typeUdt:
return reflect.TypeOf([]byte{})
default:
panic(fmt.Sprintf("not implemented makeGoLangScanType for type %d", ti.TypeId))
}
Expand Down Expand Up @@ -1366,6 +1369,8 @@ func makeGoLangTypeName(ti typeInfo) string {
return "SQL_VARIANT"
case typeBigBinary:
return "BINARY"
case typeUdt:
return strings.ToUpper(ti.UdtInfo.TypeName)
default:
panic(fmt.Sprintf("not implemented makeGoLangTypeName for type %d", ti.TypeId))
}
Expand Down Expand Up @@ -1490,9 +1495,22 @@ func makeGoLangTypeLength(ti typeInfo) (int64, bool) {
return 0, false
case typeBigBinary:
return int64(ti.Size), true
case typeUdt:
switch ti.UdtInfo.TypeName {
case "hierarchyid":
// https://learn.microsoft.com/en-us/sql/t-sql/data-types/hierarchyid-data-type-method-reference?view=sql-server-ver16
return 892, true
case "geography":
case "geometry":
return 2147483647, true
default:
panic(fmt.Sprintf("not implemented makeGoLangTypeLength for user defined type %s", ti.UdtInfo.TypeName))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we open an issue to implement app-supplied callbacks to decode unknown types?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That could be a possible way to support other data types, but i think that these are the only ones that were missing from the driver, aside from really new types like the json type

}
default:
panic(fmt.Sprintf("not implemented makeGoLangTypeLength for type %d", ti.TypeId))
}

return 0, false
}

// makes go/sql type precision and scale as described below
Expand Down Expand Up @@ -1602,6 +1620,8 @@ func makeGoLangTypePrecisionScale(ti typeInfo) (int64, int64, bool) {
return 0, 0, false
case typeBigBinary:
return 0, 0, false
case typeUdt:
return 0, 0, false
default:
panic(fmt.Sprintf("not implemented makeGoLangTypePrecisionScale for type %d", ti.TypeId))
}
Expand Down
Loading