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

Add additional types to sqlparser.SQLType() #293

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Add additional types to sqlparser.SQLType() #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f5476
Add REAL, DEC, and FIXED to SQLType()
nicktobey Dec 1, 2023
09287d7
Prevent panics for more invalid geometry queries
nicktobey Dec 2, 2023
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
71 changes: 38 additions & 33 deletions go/vt/sqlparser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2881,25 +2881,32 @@ func (ct *ColumnType) SQLType() querypb.Type {
return sqltypes.Int64
case keywordStrings[BOOL], keywordStrings[BOOLEAN]:
return sqltypes.Uint8
case keywordStrings[TEXT]:
case keywordStrings[TEXT],
keywordStrings[TINYTEXT],
keywordStrings[MEDIUMTEXT],
keywordStrings[LONGTEXT],
keywordStrings[LONG],
"long varchar":
return sqltypes.Text
case keywordStrings[TINYTEXT]:
return sqltypes.Text
case keywordStrings[MEDIUMTEXT]:
return sqltypes.Text
case keywordStrings[LONGTEXT]:
return sqltypes.Text
case keywordStrings[BLOB]:
return sqltypes.Blob
case keywordStrings[TINYBLOB]:
case keywordStrings[BLOB],
keywordStrings[TINYBLOB],
keywordStrings[MEDIUMBLOB],
keywordStrings[LONGBLOB]:
return sqltypes.Blob
case keywordStrings[MEDIUMBLOB]:
return sqltypes.Blob
case keywordStrings[LONGBLOB]:
return sqltypes.Blob
case keywordStrings[CHAR]:
case keywordStrings[CHAR],
keywordStrings[NCHAR],
"national char",
"national character":
return sqltypes.Char
case keywordStrings[VARCHAR]:
case keywordStrings[VARCHAR],
keywordStrings[NVARCHAR],
"char varying",
"character varying",
"nchar varchar",
"nchar varying",
"national varchar",
"national char varying",
"national character varying":
return sqltypes.VarChar
case keywordStrings[BINARY]:
return sqltypes.Binary
Expand All @@ -2917,9 +2924,14 @@ func (ct *ColumnType) SQLType() querypb.Type {
return sqltypes.Year
case keywordStrings[FLOAT_TYPE]:
return sqltypes.Float32
case keywordStrings[DOUBLE]:
case keywordStrings[DOUBLE],
keywordStrings[REAL],
"double precision":
return sqltypes.Float64
case keywordStrings[DECIMAL]:
case keywordStrings[DECIMAL],
keywordStrings[DEC],
keywordStrings[FIXED],
keywordStrings[NUMERIC]:
return sqltypes.Decimal
case keywordStrings[BIT]:
return sqltypes.Bit
Expand All @@ -2929,21 +2941,14 @@ func (ct *ColumnType) SQLType() querypb.Type {
return sqltypes.Set
case keywordStrings[JSON]:
return sqltypes.TypeJSON
case keywordStrings[GEOMETRY]:
return sqltypes.Geometry
case keywordStrings[POINT]:
return sqltypes.Geometry
case keywordStrings[LINESTRING]:
return sqltypes.Geometry
case keywordStrings[POLYGON]:
return sqltypes.Geometry
case keywordStrings[GEOMETRYCOLLECTION]:
return sqltypes.Geometry
case keywordStrings[MULTIPOINT]:
return sqltypes.Geometry
case keywordStrings[MULTILINESTRING]:
return sqltypes.Geometry
case keywordStrings[MULTIPOLYGON]:
case keywordStrings[GEOMETRY],
keywordStrings[POINT],
keywordStrings[LINESTRING],
keywordStrings[POLYGON],
keywordStrings[GEOMETRYCOLLECTION],
keywordStrings[MULTIPOINT],
keywordStrings[MULTILINESTRING],
keywordStrings[MULTIPOLYGON]:
return sqltypes.Geometry
}
panic("unimplemented type " + ct.Type)
Expand Down
12 changes: 12 additions & 0 deletions go/vt/sqlparser/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6776,6 +6776,18 @@ var (
}, {
input: "create table t (id int primary key, col1 FLOAT SRID 0)",
output: "cannot define SRID for non spatial types at position 55 near '0'",
}, {
input: "create table t (id int primary key, col1 REAL SRID 0)",
output: "cannot define SRID for non spatial types at position 54 near '0'",
}, {
input: "create table t (id int primary key, col1 DEC(34, 2) SRID 0)",
output: "cannot define SRID for non spatial types at position 60 near '0'",
}, {
input: "create table t (id int primary key, col1 FIXED(4, 4) SRID 0)",
output: "cannot define SRID for non spatial types at position 61 near '0'",
}, {
input: "create table t (id int primary key, col1 NCHAR VARCHAR SRID 0)",
output: "cannot define SRID for non spatial types at position 63 near '0'",
}, {
input: "create table t (id int primary key, col1 geometry SRID -1)",
output: "syntax error at position 57 near 'SRID'",
Expand Down