Commit 9bb81e5

authored

Merge pull request #24 from komali2/master

Change "refrence" to "reference" in all instances

2 parents ff9b7ce + 499bc18 commit 9bb81e5Copy full SHA for 9bb81e5

File tree

2 files changed

+13

-13

lines changed

src
- sqlParser.jison
- stringify.js

2 files changed

+13

-13

lines changed

`‎src/sqlParser.jison‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`[-][-]\s.\n / skip sql comments */`
`11`	`11`	`[#]\s.\n / skip sql comments */`
`12`	`12`	`\s+ /* skip whitespace */`
`13`		`-`
	`13`	`+`
`14`	`14`	[`][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*[`] return 'IDENTIFIER'
`15`	`15`	`[\w]+[\u4e00-\u9fa5]+[0-9a-zA-Z_\u4e00-\u9fa5]* return 'IDENTIFIER'`
`16`	`16`	`[\u4e00-\u9fa5][0-9a-zA-Z_\u4e00-\u9fa5]* return 'IDENTIFIER'`
`@@ -117,7 +117,7 @@ UNION return 'UNION'`
`117`	`117`	`"{" return '{'`
`118`	`118`	`"}" return '}'`
`119`	`119`	`";" return ';'`
`120`		`-`
	`120`	`+`
`121`	`121`	`['](\\.\|[^'])*['] return 'STRING'`
`122`	`122`	`["](\\.\|[^"])*["] return 'STRING'`
`123`	`123`	`[0][x][0-9a-fA-F]+ return 'HEX_NUMERIC'`
`@@ -127,7 +127,7 @@ UNION return 'UNION'`
`127`	`127`	`[a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]* return 'IDENTIFIER'`
`128`	`128`	`\. return 'DOT'`
`129`	`129`	`['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["'] return 'QUOTED_IDENTIFIER'`
`130`		`-`
	`130`	`+`
`131`	`131`	`<<EOF>> return 'EOF'`
`132`	`132`	`. return 'INVALID'`
`133`	`133`
`@@ -189,7 +189,7 @@ unionClauseNotParenthesized`
`189`	`189`	`;`
`190`	`190`
`191`	`191`	`selectClause`
`192`		`- : SELECT`
	`192`	`+ : SELECT`
`193`	`193`	`distinctOpt`
`194`	`194`	`highPriorityOpt`
`195`	`195`	`maxStateMentTimeOpt`
`@@ -228,7 +228,7 @@ selectClause`
`228`	`228`	`;`
`229`	`229`
`230`	`230`	`distinctOpt`
`231`		`- : ALL { $$ = 1ドル }`
	`231`	`+ : ALL { $$ = 1ドル }`
`232`	`232`	`\| DISTINCT { $$ = 1ドル }`
`233`	`233`	`\| DISTINCTROW { $$ = 1ドル }`
`234`	`234`	`\| { $$ = null }`
`@@ -361,7 +361,7 @@ simple_expr`
`361`	`361`	`;`
`362`	`362`	`bit_expr`
`363`	`363`	`: simple_expr { $$ = 1ドル }`
`364`		`- \| bit_expr '\|' bit_expr { $$ = { type: 'BitExpression', operator: '\|', left: 1ドル, right: 3ドル } }`
	`364`	`+ \| bit_expr '\|' bit_expr { $$ = { type: 'BitExpression', operator: '\|', left: 1ドル, right: 3ドル } }`
`365`	`365`	`\| bit_expr '&' bit_expr { $$ = { type: 'BitExpression', operator: '&', left: 1ドル, right: 3ドル } }`
`366`	`366`	`\| bit_expr '<<' bit_expr { $$ = { type: 'BitExpression', operator: '<<', left: 1ドル, right: 3ドル } }`
`367`	`367`	`\| bit_expr '>>' bit_expr { $$ = { type: 'BitExpression', operator: '>>', left: 1ドル, right: 3ドル } }`
`@@ -494,12 +494,12 @@ selectDataSetOpt`
`494`	`494`	`{ $$ = { from: 2ドル, partition: 3ドル, where: 4ドル, groupBy: 5ドル, having: 6ドル, orderBy: 7ドル, limit: 8ドル, procedure: 9ドル, updateLockMode: 10ドル } }`
`495`	`495`	`;`
`496`	`496`	`table_refrences`
`497`		`- : escaped_table_reference { $$ = { type: 'TableRefrences', value: [ 1ドル ] } }`
	`497`	`+ : escaped_table_reference { $$ = { type: 'TableReferences', value: [ 1ドル ] } }`
`498`	`498`	`\| table_refrences ',' escaped_table_reference %prec TABLE_REF_COMMA { $$ = 1ドル; 1ドル.value.push(3ドル); }`
`499`	`499`	`;`
`500`	`500`	`escaped_table_reference`
`501`		`- : table_reference { $$ = { type: 'TableRefrence', value: 1ドル } }`
`502`		`- \| '{' OJ table_reference '}' { $$ = { type: 'TableRefrence', hasOj: true, value: 3ドル } }`
	`501`	`+ : table_reference { $$ = { type: 'TableReference', value: 1ドル } }`
	`502`	`+ \| '{' OJ table_reference '}' { $$ = { type: 'TableReference', hasOj: true, value: 3ドル } }`
`503`	`503`	`;`
`504`	`504`	`join_inner_cross`
`505`	`505`	`: { $$ = null }`

`‎src/stringify.js‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -387,9 +387,9 @@ Sql.prototype.travelLimit = function (ast) {`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`	`}`
`390`		`-Sql.prototype.travelTableRefrences = function (ast) {`
	`390`	`+Sql.prototype.travelTableReferences = function (ast) {`
`391`	`391`	`var list = ast.value;`
`392`		`- if (ast.TableRefrences) {`
	`392`	`+ if (ast.TableReferences) {`
`393`	`393`	`this.append('(', false, true);`
`394`	`394`	`}`
`395`	`395`	`for (var i = 0; i < list.length; i++) {`
`@@ -398,11 +398,11 @@ Sql.prototype.travelTableRefrences = function (ast) {`
`398`	`398`	`this.append(',', true);`
`399`	`399`	`}`
`400`	`400`	`}`
`401`		`- if (ast.TableRefrences) {`
	`401`	`+ if (ast.TableReferences) {`
`402`	`402`	`this.append(')');`
`403`	`403`	`}`
`404`	`404`	`}`
`405`		`-Sql.prototype.travelTableRefrence = function (ast) {`
	`405`	`+Sql.prototype.travelTableReference = function (ast) {`
`406`	`406`	`if (ast.hasOj) {`
`407`	`407`	`this.append('{');`
`408`	`408`	`this.appendKeyword('oj');`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 9bb81e5

File tree

2 files changed

2 files changed

`‎src/sqlParser.jison‎`

`‎src/stringify.js‎`

0 commit comments