Commit 26e0b61

authored

Merge pull request #61 from JavaScriptor/feat-use-function-in-table-ref

feat: support function call in table_factor.

2 parents ca3c259 + 14b3146 commit 26e0b61Copy full SHA for 26e0b61

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ sql grammar follows https://dev.mysql.com/doc/refman/5.7/en/select.html`
`10`	`10`
`11`	`11`	`## news`
`12`	`12`
	`13`	+- Unicode extended char support for column name or alias & Function call in `table_factor` since v1.6.0
`13`	`14`	- Support feature `PlaceHolder like ${param}` since v1.5.0 [#43](https://github.com/JavaScriptor/js-sql-parser/pull/43)
`14`	`15`	- Fix bug `using ' & " for column alias?` since v1.4.1 [#40](https://github.com/JavaScriptor/js-sql-parser/issues/40), [#44](https://github.com/JavaScriptor/js-sql-parser/issues/44)
`15`	`16`	`- Fix bug tableFactor alias since v1.3.0 [#34](https://github.com/JavaScriptor/js-sql-parser/issues/34)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-sql-parser",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "1.6.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "./dist/parser/sqlParser.js",`
`6`	`6`	`"scripts": {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ table_factor`
`588`	`588`	`: identifier partitionOpt aliasOpt index_hint_list_opt { $$ = { type: 'TableFactor', value: 1ドル, partition: 2ドル, alias: 3ドル.alias, hasAs: 3ドル.hasAs, indexHintOpt: 4ドル } }`
`589`	`589`	`\| '(' selectClause ')' aliasOpt { $$ = { type: 'TableFactor', value: { type: 'SubQuery', value: 2ドル }, alias: 4ドル.alias, hasAs: 4ドル.hasAs} }`
`590`	`590`	`\| '(' table_references ')' { $$ = 2ドル; $$.hasParentheses = true }`
	`591`	`+ \| function_call aliasOpt index_hint_list_opt { $$ = { type: 'TableFactor', value: 1ドル, alias: 2ドル.alias, hasAs: 2ドル.hasAs, indexHintOpt: 3ドル } }`
`591`	`592`	`;`
`592`	`593`	`place_holder`
`593`	`594`	`: PLACE_HOLDER { $$ = { type: 'PlaceHolder', value: 1ドル, param: 1ドル.slice(2, -1)} }`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -462,4 +462,10 @@ describe('select grammar support', function () {`
`462`	`462`	`かわいい`
`463`	`463`	from table`)
`464`	`464`	`})`
	`465`	`+`
	`466`	`+ it('#60 Call function in FROM clause', function() {`
	`467`	+ testParser(`
	`468`	`+ SELECT one.name, group_concat(j.value, ', ') FROM one, json_each(one.stringArray) AS j GROUP BY one.id`
	`469`	+ `)
	`470`	`+ })`
`465`	`471`	`});`

Comments

(0)