Skip to content

Commit 20954f2

Browse files
committed
merge main
2 parents 22f7e13 + d2b62e0 commit 20954f2

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/dolthub/dolt/go v0.40.5-0.20251213003033-5aae073ad198
1010
github.com/dolthub/eventsapi_schema v0.0.0-20250915094920-eadfd39051ca
1111
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
12-
github.com/dolthub/go-mysql-server v0.20.1-0.20251216005908-df5d1018a216
12+
github.com/dolthub/go-mysql-server v0.20.1-0.20251215235453-b3613827cc44
1313
github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1
1414
github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
1515
github.com/dolthub/vitess v0.0.0-20251210200925-1d33d416d162

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,12 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
238238
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
239239
github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790 h1:zxMsH7RLiG+dlZ/y0LgJHTV26XoiSJcuWq+em6t6VVc=
240240
github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
241-
github.com/dolthub/go-mysql-server v0.20.1-0.20251216005908-df5d1018a216 h1:Y5BkRx0prW70wqlhC5uYzEtGZ8CmYz/72G56cy4vcV4=
242-
github.com/dolthub/go-mysql-server v0.20.1-0.20251216005908-df5d1018a216/go.mod h1:NjewWKoa5bVSLdKwL7fg7eAfrcIxDybWUKoWEHWRTw4=
241+
github.com/dolthub/go-mysql-server v0.20.1-0.20251212235309-4422a1ca9f43 h1:3OiTNnL3rFiSXGo7/xTt64FmJGtGU1igvyPishbsM4o=
242+
github.com/dolthub/go-mysql-server v0.20.1-0.20251212235309-4422a1ca9f43/go.mod h1:NjewWKoa5bVSLdKwL7fg7eAfrcIxDybWUKoWEHWRTw4=
243+
github.com/dolthub/go-mysql-server v0.20.1-0.20251215224112-7cb4535802a5 h1:gjUTlYUVTWnKoZBizqLQzWL/rxwT4ZC8IGt49pzpCQg=
244+
github.com/dolthub/go-mysql-server v0.20.1-0.20251215224112-7cb4535802a5/go.mod h1:NjewWKoa5bVSLdKwL7fg7eAfrcIxDybWUKoWEHWRTw4=
245+
github.com/dolthub/go-mysql-server v0.20.1-0.20251215235453-b3613827cc44 h1:/e1XKLp5D200IwFq7uKAFgza30NuNTmbpD7VgcrAqhI=
246+
github.com/dolthub/go-mysql-server v0.20.1-0.20251215235453-b3613827cc44/go.mod h1:NjewWKoa5bVSLdKwL7fg7eAfrcIxDybWUKoWEHWRTw4=
243247
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
244248
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
245249
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

server/types/type.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -625,12 +625,7 @@ func (t *DoltgresType) MaxCharacterLength() int64 {
625625

626626
// IsNumericType implements the sql.NumberType interface.
627627
func (t *DoltgresType) IsNumericType() bool {
628-
switch t.TypCategory {
629-
case TypeCategory_NumericTypes:
630-
return true
631-
default:
632-
return false
633-
}
628+
return t.TypCategory == TypeCategory_NumericTypes
634629
}
635630

636631
// IsFloat implements the sql.NumberType interface.
@@ -663,6 +658,11 @@ func (t *DoltgresType) DisplayWidth() int {
663658
}
664659
}
665660

661+
// IsStringType implements the sql.StringType interface.
662+
func (t *DoltgresType) IsStringType() bool {
663+
return t.TypCategory == TypeCategory_StringTypes
664+
}
665+
666666
// MaxSerializedWidth implements the types.ExtendedType interface.
667667
func (t *DoltgresType) MaxSerializedWidth() sql.ExtendedTypeSerializedWidth {
668668
if t.TypLength < 0 {

0 commit comments

Comments
 (0)