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

release-20.2: sql: allow implicit casting of string to more array types #54944

Merged
merged 1 commit into from
Sep 29, 2020
Merged

release-20.2: sql: allow implicit casting of string to more array types #54944

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
26 changes: 26 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/array
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,3 +1750,29 @@ SELECT CASE
END
----
(2,{-23791})

# Test that string literals can be implicitly casted to array types
statement ok
DROP TABLE t;
CREATE TABLE t (
a INT[],
b DECIMAL[],
c UUID[],
d STRING[],
e TIMESTAMPTZ[],
f DATE[],
g INTERVAL[],
h INET[],
i VARBIT[],
j FLOAT[]);
INSERT INTO t VALUES (
'{1, 2}',
'{1.1, 2.2}',
'{18e7b17e-4ead-4e27-bfd5-bb6d11261bb6, 18e7b17e-4ead-4e27-bfd5-bb6d11261bb7}',
'{cat, dog}',
'{2010-09-28 12:00:00.1, 2010-09-29 12:00:00.1}',
'{2010-09-28, 2010-09-29}',
'{PT12H2M, -23:00:00}',
'{192.168.100.128, ::ffff:10.4.3.2}',
'{0101, 11}',
'{12.34, 45.67}');
13 changes: 12 additions & 1 deletion pkg/sql/sem/tree/constant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,20 +469,31 @@ var (
types.Date,
types.StringArray,
types.IntArray,
types.FloatArray,
types.DecimalArray,
types.BoolArray,
types.Box2D,
types.Geography,
types.Geometry,
types.DecimalArray,
types.Time,
types.TimeTZ,
types.Timestamp,
types.TimestampTZ,
types.Interval,
types.Uuid,
types.DateArray,
types.TimeArray,
types.TimeTZArray,
types.TimestampArray,
types.TimestampTZArray,
types.IntervalArray,
types.UUIDArray,
types.INet,
types.Jsonb,
types.VarBit,
types.AnyEnum,
types.INetArray,
types.VarBitArray,
}
// StrValAvailBytes is the set of types convertible to byte array.
StrValAvailBytes = []*types.T{types.Bytes, types.Uuid, types.String, types.AnyEnum}
Expand Down
223 changes: 196 additions & 27 deletions pkg/sql/sem/tree/constant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,27 @@ func TestStringConstantVerifyAvailableTypes(t *testing.T) {
}
}

func mustParseDInt(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDInt(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDFloat(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDFloat(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDDecimal(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDDecimal(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDBool(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDBool(s)
if err != nil {
Expand Down Expand Up @@ -286,45 +307,93 @@ func mustParseDJSON(t *testing.T, s string) tree.Datum {
}
return d
}
func mustParseDStringArray(t *testing.T, s string) tree.Datum {
evalContext := tree.MakeTestingEvalContext(cluster.MakeTestingClusterSettings())
d, _, err := tree.ParseDArrayFromString(&evalContext, s, types.String)
func mustParseDUuid(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDUuidFromString(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDBox2D(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDBox2D(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDGeography(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDGeography(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDGeometry(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDGeometry(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDIntArray(t *testing.T, s string) tree.Datum {
evalContext := tree.MakeTestingEvalContext(cluster.MakeTestingClusterSettings())
d, _, err := tree.ParseDArrayFromString(&evalContext, s, types.Int)
func mustParseDINet(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDIPAddrFromINetString(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDDecimalArray(t *testing.T, s string) tree.Datum {
evalContext := tree.MakeTestingEvalContext(cluster.MakeTestingClusterSettings())
d, _, err := tree.ParseDArrayFromString(&evalContext, s, types.Decimal)
func mustParseDVarBit(t *testing.T, s string) tree.Datum {
d, err := tree.ParseDBitArray(s)
if err != nil {
t.Fatal(err)
}
return d
}
func mustParseDArrayOfType(typ *types.T) func(t *testing.T, s string) tree.Datum {
return func(t *testing.T, s string) tree.Datum {
evalContext := tree.MakeTestingEvalContext(cluster.MakeTestingClusterSettings())
d, _, err := tree.ParseDArrayFromString(&evalContext, s, typ)
if err != nil {
t.Fatal(err)
}
return d
}
}

var parseFuncs = map[*types.T]func(*testing.T, string) tree.Datum{
types.String: func(t *testing.T, s string) tree.Datum { return tree.NewDString(s) },
types.Bytes: func(t *testing.T, s string) tree.Datum { return tree.NewDBytes(tree.DBytes(s)) },
types.Bool: mustParseDBool,
types.Date: mustParseDDate,
types.Time: mustParseDTime,
types.TimeTZ: mustParseDTimeTZ,
types.Timestamp: mustParseDTimestamp,
types.TimestampTZ: mustParseDTimestampTZ,
types.Interval: mustParseDInterval,
types.Jsonb: mustParseDJSON,
types.DecimalArray: mustParseDDecimalArray,
types.IntArray: mustParseDIntArray,
types.StringArray: mustParseDStringArray,
types.String: func(t *testing.T, s string) tree.Datum { return tree.NewDString(s) },
types.Bytes: func(t *testing.T, s string) tree.Datum { return tree.NewDBytes(tree.DBytes(s)) },
types.Int: mustParseDInt,
types.Float: mustParseDFloat,
types.Decimal: mustParseDDecimal,
types.Bool: mustParseDBool,
types.Date: mustParseDDate,
types.Time: mustParseDTime,
types.TimeTZ: mustParseDTimeTZ,
types.Timestamp: mustParseDTimestamp,
types.TimestampTZ: mustParseDTimestampTZ,
types.Interval: mustParseDInterval,
types.Jsonb: mustParseDJSON,
types.Uuid: mustParseDUuid,
types.Box2D: mustParseDBox2D,
types.Geography: mustParseDGeography,
types.Geometry: mustParseDGeometry,
types.INet: mustParseDINet,
types.VarBit: mustParseDVarBit,
types.DecimalArray: mustParseDArrayOfType(types.Decimal),
types.FloatArray: mustParseDArrayOfType(types.Float),
types.IntArray: mustParseDArrayOfType(types.Int),
types.StringArray: mustParseDArrayOfType(types.String),
types.BoolArray: mustParseDArrayOfType(types.Bool),
types.UUIDArray: mustParseDArrayOfType(types.Uuid),
types.DateArray: mustParseDArrayOfType(types.Date),
types.TimeArray: mustParseDArrayOfType(types.Time),
types.TimeTZArray: mustParseDArrayOfType(types.TimeTZ),
types.TimestampArray: mustParseDArrayOfType(types.Timestamp),
types.TimestampTZArray: mustParseDArrayOfType(types.TimestampTZ),
types.IntervalArray: mustParseDArrayOfType(types.Interval),
types.INetArray: mustParseDArrayOfType(types.INet),
types.VarBitArray: mustParseDArrayOfType(types.VarBit),
}

func typeSet(tys ...*types.T) map[*types.T]struct{} {
Expand Down Expand Up @@ -391,17 +460,54 @@ func TestStringConstantResolveAvailableTypes(t *testing.T) {
c: tree.NewBytesStrVal("PT12H2M"),
parseOptions: typeSet(types.String, types.Bytes),
},
{
c: tree.NewStrVal("box(0 0, 1 1)"),
parseOptions: typeSet(types.String, types.Bytes, types.Box2D),
},
{
c: tree.NewStrVal("POINT(-100.59 42.94)"),
parseOptions: typeSet(types.String, types.Bytes, types.Geography, types.Geometry),
},
{
c: tree.NewStrVal("192.168.100.128/25"),
parseOptions: typeSet(types.String, types.Bytes, types.INet),
},
{
c: tree.NewStrVal("111000110101"),
parseOptions: typeSet(
types.String,
types.Bytes,
types.VarBit,
types.Int,
types.Float,
types.Decimal,
types.Interval,
types.Jsonb),
},
{
c: tree.NewStrVal(`{"a": 1}`),
parseOptions: typeSet(types.String, types.Bytes, types.Jsonb),
},
{
c: tree.NewStrVal(`{1,2}`),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.IntArray, types.DecimalArray),
c: tree.NewStrVal(`{1,2}`),
parseOptions: typeSet(
types.String,
types.Bytes,
types.StringArray,
types.IntArray,
types.FloatArray,
types.DecimalArray,
types.IntervalArray),
},
{
c: tree.NewStrVal(`{1.5,2.0}`),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.DecimalArray),
c: tree.NewStrVal(`{1.5,2.0}`),
parseOptions: typeSet(
types.String,
types.Bytes,
types.StringArray,
types.FloatArray,
types.DecimalArray,
types.IntervalArray),
},
{
c: tree.NewStrVal(`{a,b}`),
Expand All @@ -411,6 +517,66 @@ func TestStringConstantResolveAvailableTypes(t *testing.T) {
c: tree.NewBytesStrVal(string([]byte{0xff, 0xfe, 0xfd})),
parseOptions: typeSet(types.String, types.Bytes),
},
{
c: tree.NewStrVal(`18e7b17e-4ead-4e27-bfd5-bb6d11261bb6`),
parseOptions: typeSet(types.String, types.Bytes, types.Uuid),
},
{
c: tree.NewStrVal(`{18e7b17e-4ead-4e27-bfd5-bb6d11261bb6, 18e7b17e-4ead-4e27-bfd5-bb6d11261bb7}`),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.UUIDArray),
},
{
c: tree.NewStrVal("{true, false}"),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.BoolArray),
},
{
c: tree.NewStrVal("{2010-09-28, 2010-09-29}"),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.DateArray, types.TimestampArray, types.TimestampTZArray),
},
{
c: tree.NewStrVal("{2010-09-28 12:00:00.1, 2010-09-29 12:00:00.1}"),
parseOptions: typeSet(
types.String,
types.Bytes,
types.StringArray,
types.TimeArray,
types.TimeTZArray,
types.TimestampArray,
types.TimestampTZArray,
types.DateArray),
},
{
c: tree.NewStrVal("{2006-07-08T00:00:00.000000123Z, 2006-07-10T00:00:00.000000123Z}"),
parseOptions: typeSet(
types.String,
types.Bytes,
types.StringArray,
types.TimeArray,
types.TimeTZArray,
types.TimestampArray,
types.TimestampTZArray,
types.DateArray),
},
{
c: tree.NewStrVal("{PT12H2M, -23:00:00}"),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.IntervalArray),
},
{
c: tree.NewStrVal("{192.168.100.128, ::ffff:10.4.3.2}"),
parseOptions: typeSet(types.String, types.Bytes, types.StringArray, types.INetArray),
},
{
c: tree.NewStrVal("{0101, 11}"),
parseOptions: typeSet(
types.String,
types.Bytes,
types.StringArray,
types.IntArray,
types.FloatArray,
types.DecimalArray,
types.IntervalArray,
types.VarBitArray),
},
}

evalCtx := tree.NewTestingEvalContext(cluster.MakeTestingClusterSettings())
Expand All @@ -435,7 +601,10 @@ func TestStringConstantResolveAvailableTypes(t *testing.T) {
res, err = typedExpr.Eval(evalCtx)
}
if err != nil {
if !strings.Contains(err.Error(), "could not parse") && !strings.Contains(err.Error(), "parsing") {
if !strings.Contains(err.Error(), "could not parse") &&
!strings.Contains(err.Error(), "parsing") &&
!strings.Contains(err.Error(), "out of range") &&
!strings.Contains(err.Error(), "exceeds supported") {
// Parsing errors are permitted for this test, but the number of correctly
// parseable types will be verified. Any other error should throw a failure.
t.Errorf("%d: expected resolving %v as available type %s would either succeed"+
Expand Down
40 changes: 40 additions & 0 deletions pkg/sql/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,46 @@ var (
DecimalArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Decimal, Oid: oid.T__numeric, Locale: &emptyLocale}}

// BoolArray is the type of an array value having Bool-typed elements.
BoolArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Bool, Oid: oid.T__bool, Locale: &emptyLocale}}

// UUIDArray is the type of an array value having UUID-typed elements.
UUIDArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Uuid, Oid: oid.T__uuid, Locale: &emptyLocale}}

// TimeArray is the type of an array value having Date-typed elements.
DateArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Date, Oid: oid.T__date, Locale: &emptyLocale}}

// TimeArray is the type of an array value having Time-typed elements.
TimeArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Time, Oid: oid.T__time, Locale: &emptyLocale}}

// TimeTZArray is the type of an array value having TimeTZ-typed elements.
TimeTZArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: TimeTZ, Oid: oid.T__timetz, Locale: &emptyLocale}}

// TimestampArray is the type of an array value having Timestamp-typed elements.
TimestampArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Timestamp, Oid: oid.T__timestamp, Locale: &emptyLocale}}

// TimestampTZArray is the type of an array value having TimestampTZ-typed elements.
TimestampTZArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: TimestampTZ, Oid: oid.T__timestamptz, Locale: &emptyLocale}}

// IntervalArray is the type of an array value having Interval-typed elements.
IntervalArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: Interval, Oid: oid.T__interval, Locale: &emptyLocale}}

// INetArray is the type of an array value having INet-typed elements.
INetArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: INet, Oid: oid.T__inet, Locale: &emptyLocale}}

// VarBitArray is the type of an array value having VarBit-typed elements.
VarBitArray = &T{InternalType: InternalType{
Family: ArrayFamily, ArrayContents: VarBit, Oid: oid.T__varbit, Locale: &emptyLocale}}

// Int2Vector is a type-alias for an array of Int2 values with a different
// OID (T_int2vector instead of T__int2). It is a special VECTOR type used
// by Postgres in system tables. Int2vectors are 0-indexed, unlike normal arrays.
Expand Down