Commit f2524a0

authored

Merge pull request #43 from sockstack/add-place-holder-support

`${value}` like place holder support

2 parents 09b15e4 + 4200a15 commit f2524a0Copy full SHA for f2524a0

File tree

+27

-0

lines changed

+27

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`[#]\s.\n / skip sql comments */`
`12`	`12`	`\s+ /* skip whitespace */`
`13`	`13`
	`14`	`+[$][{](.*?)[}] return 'PLACE_HOLDER'`
`14`	`15`	[`][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*[`] return 'IDENTIFIER'
`15`	`16`	`[\w]+[\u4e00-\u9fa5]+[0-9a-zA-Z_\u4e00-\u9fa5]* return 'IDENTIFIER'`
`16`	`17`	`[\u4e00-\u9fa5][0-9a-zA-Z_\u4e00-\u9fa5]* return 'IDENTIFIER'`
`@@ -304,6 +305,7 @@ literal`
`304`	`305`	`\| number { $$ = 1ドル }`
`305`	`306`	`\| boolean { $$ = 1ドル }`
`306`	`307`	`\| null { $$ = 1ドル }`
	`308`	`+ \| place_holder { $$ = 1ドル }`
`307`	`309`	`;`
`308`	`310`	`function_call`
`309`	`311`	`: IDENTIFIER '(' function_call_param_list ')' { $$ = {type: 'FunctionCall', name: 1ドル, params: 3ドル} }`
`@@ -587,3 +589,6 @@ table_factor`
`587`	`589`	`\| '(' selectClause ')' aliasOpt { $$ = { type: 'TableFactor', value: { type: 'SubQuery', value: 2ドル }, alias: 4ドル.alias, hasAs: 4ドル.hasAs} }`
`588`	`590`	`\| '(' table_references ')' { $$ = 2ドル; $$.hasParentheses = true }`
`589`	`591`	`;`
	`592`	`+place_holder`
	`593`	`+ : PLACE_HOLDER { $$ = { type: 'PlaceHolder', value: 1ドル, param: 1ドル.slice(2, -1)} }`
	`594`	`+ ;`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -551,3 +551,20 @@ Sql.prototype.travelSelectParenthesized = function(ast) {`
`551`	`551`	`this.travel(ast.value);`
`552`	`552`	`this.appendKeyword(')');`
`553`	`553`	`};`
	`554`	`+Sql.prototype.travelPlaceHolder = function (ast) {`
	`555`	`+ if (ast.left) {`
	`556`	`+ this.travel(ast.left);`
	`557`	`+ }`
	`558`	`+`
	`559`	`+ if (ast.operator) {`
	`560`	`+ this.append(ast.operator);`
	`561`	`+ }`
	`562`	`+`
	`563`	`+ if (ast.right) {`
	`564`	`+ this.append(ast.right);`
	`565`	`+ }`
	`566`	`+`
	`567`	`+ if (ast.value) {`
	`568`	`+ this.travel(ast.value);`
	`569`	`+ }`
	`570`	`+};`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,11 @@ describe('select grammar support', function () {`
`411`	`411`	`it('bugfix table alias2', function () {`
`412`	`412`	`testParser('select a.* from a t1 join b t2 on t1.a = t2.a')`
`413`	`413`	`});`
	`414`	`+ it('place holder support', function() {`
	`415`	`+ testParser(`
	`416`	`+ "select sum(quota_value) value, busi_col2 as sh, ${a} as a, YEAR(now()) from der_quota_summary where table_ename = 'gshmyyszje_derivedidx' and cd = (select id from t1 where a = ${t1})"`
	`417`	`+ )`
	`418`	`+ });`
`414`	`419`
`415`	`420`	`it('support quoted alias: multiple alias and orderby support', function () {`
`416`	`421`	testParser('select a as `A A`, b as `B B` from z');

Comments

(0)