Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions pegjs/transactsql.pegjs
Original file line number Diff line number Diff line change
Expand Up @@ -1814,6 +1814,9 @@ table_base
type: 'dual'
};
}
/ e:func_call __ alias:alias_clause? {
return { type: 'expr', expr: e, as: alias };
}
/ t:table_name __ tt:temporal_table? __ alias:alias_clause? __ th:table_hint? {
t.as = alias
t.table_hint = th
Expand Down
3 changes: 2 additions & 1 deletion src/column.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ function columnRefToSQL(expr) {
function columnDataType(definition) {
if (!definition) return
const { dataType, length, suffix, scale, expr } = definition
let result = dataTypeToSQL({ dataType, length, suffix, scale, parentheses: length != null ? true : false })
const parentheses = length != null && true || false
let result = dataTypeToSQL({ dataType, length, suffix, scale, parentheses })
if (expr) result += exprToSQL(expr)
if (definition.array) {
const arrayExpr = arrayDimensionToSymbol(definition)
Expand Down
7 changes: 7 additions & 0 deletions test/transactsql.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,13 @@ describe('transactsql', () => {
'CREATE TABLE [visits] ([url] VARBINARY(max))'
]
},
{
title: 'table-valued function in from clause',
sql: [
"select * from dbo.fn_name(N'000')",
"SELECT * FROM dbo.fn_name(N'000')"
]
},
]
SQL_LIST.forEach(sqlInfo => {
const { title, sql } = sqlInfo
Expand Down