Visitar URL original
chore: init stringify.js · JavaScriptor/js-sql-parser@b39fc4f · GitHub
Skip to content

Commit b39fc4f

Browse files
albin3albin3
committed
chore: init stringify.js
1 parent 71091bd commit b39fc4f

7 files changed

Lines changed: 476 additions & 269 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea/
22
node_modules
33
*.log
4+
*.swp

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ TEST = $(shell ls -S `find test -type f -name "*.test.js"`)
22

33
test:
44
node --harmony ./node_modules/.bin/jison -m js ./src/sqlParser.jison -o ./dist/parser/sqlParser.js
5+
cat src/stringify.js >> ./dist/parser/sqlParser.js
56
cat src/suffix.js >> ./dist/parser/sqlParser.js
67
mocha $(TEST)
78

‎dist/parser/sqlParser.js‎

Lines changed: 331 additions & 232 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/sqlParser.jison‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,11 @@ selectClause
168168
sqlBigResultOpt
169169
sqlBufferResultOpt
170170
sqlCacheOpt
171-
sqlNoCacheOpt
172171
sqlCalcFoundRowsOpt
173172
selectExprList
174173
selectDataSetOpt
175174
{
176-
return {
175+
$$ = {
177176
type: 'Select',
178177
distinctOpt: $2,
179178
highPriorityOpt: $3,
@@ -183,18 +182,17 @@ selectClause
183182
sqlBigResultOpt: $7,
184183
sqlBufferResultOpt: $8,
185184
sqlCacheOpt: $9,
186-
sqlNoCacheOpt: $10,
187-
sqlCalcFoundRowsOpt: $11,
188-
selectExprList: $12,
189-
from: $13.from,
190-
partition: $13.partition,
191-
where: $13.where,
192-
groupBy: $13.groupBy,
193-
having: $13.having,
194-
orderBy: $13.orderBy,
195-
limit: $13.limit,
196-
procedure: $13.procedure,
197-
updateLockMode: $13.updateLockMode
185+
sqlCalcFoundRowsOpt: $10,
186+
selectItems: $11,
187+
from: $12.from,
188+
partition: $12.partition,
189+
where: $12.where,
190+
groupBy: $12.groupBy,
191+
having: $12.having,
192+
orderBy: $12.orderBy,
193+
limit: $12.limit,
194+
procedure: $12.procedure,
195+
updateLockMode: $12.updateLockMode
198196
}
199197
}
200198
;
@@ -206,44 +204,41 @@ distinctOpt
206204
| { $$ = null }
207205
;
208206
highPriorityOpt
209-
: HIGH_PRIORITY { $$ = true }
207+
: HIGH_PRIORITY { $$ = $1 }
210208
| { $$ = null }
211209
;
212210
maxStateMentTimeOpt
213211
: MAX_STATEMENT_TIME '=' NUMERIC { $$ = $3 }
214212
| { $$ = null }
215213
;
216214
straightJoinOpt
217-
: STRAIGHT_JOIN { $$ = true }
215+
: STRAIGHT_JOIN { $$ = $1 }
218216
| { $$ = null }
219217
;
220218
sqlSmallResultOpt
221-
: SQL_SMALL_RESULT { $$ = true }
219+
: SQL_SMALL_RESULT { $$ = $1 }
222220
| { $$ = null }
223221
;
224222
sqlBigResultOpt
225-
: SQL_BIG_RESULT { $$ = true }
223+
: SQL_BIG_RESULT { $$ = $1 }
226224
| { $$ = null }
227225
;
228226
sqlBufferResultOpt
229-
: SQL_BUFFER_RESULT { $$ = true }
227+
: SQL_BUFFER_RESULT { $$ = $1 }
230228
| { $$ = null }
231229
;
232230
sqlCacheOpt
233-
: SQL_CACHE { $$ = true }
234-
| { $$ = null }
235-
;
236-
sqlNoCacheOpt
237-
: SQL_NO_CACHE { $$ = true }
238-
| { $$ = null }
231+
: { $$ = null }
232+
| SQL_CACHE { $$ = $1 }
233+
| SQL_NO_CACHE { $$ = $1 }
239234
;
240235
sqlCalcFoundRowsOpt
241-
: SQL_CALC_FOUND_ROWS { $$ = true }
236+
: SQL_CALC_FOUND_ROWS { $$ = $1 }
242237
| { $$ = null }
243238
;
244239
selectExprList
245-
: selectExprList ',' selectExpr { $3.type = 'SelectExpr'; $$.push($3); }
246-
| selectExpr { $1.type = 'SelectExpr'; $$ = [ $1 ]; }
240+
: selectExprList ',' selectExpr { $1.value.push($3); }
241+
| selectExpr { $$ = { type: 'SelectExpr', value: [ $1 ] } }
247242
;
248243
selectExpr
249244
: '*' { $$ = { value: $1 } }
@@ -393,10 +388,10 @@ expr
393388
: boolean_primary { $$ = $1 }
394389
| boolean_primary IS not_opt boolean_extra { $$ = { type: 'IsExpression', hasNot: $3, left: $1, right: $4 } }
395390
| NOT expr { $$ = { type: 'NotExpression', value: $2 } }
396-
| expr '&&' expr { $$ = { type: 'AndOpExpression', left: $1, right: $3 } }
397-
| expr '||' expr { $$ = { type: 'OrOpExpression', left: $1, right: $3 } }
398-
| expr OR expr { $$ = { type: 'OrExpression', left: $1, right: $3 } }
399-
| expr AND expr { $$ = { type: 'AndExpression', left: $1, right: $3 } }
391+
| expr '&&' expr { $$ = { type: 'AndExpression', operator: $2, left: $1, right: $3 } }
392+
| expr '||' expr { $$ = { type: 'OrExpression', operator: $2, left: $1, right: $3 } }
393+
| expr OR expr { $$ = { type: 'OrExpression', operator: $2, left: $1, right: $3 } }
394+
| expr AND expr { $$ = { type: 'AndExpression', operator: $2, left: $1, right: $3 } }
400395
| expr XOR expr { $$ = { type: 'XORExpression', left: $1, right: $3 } }
401396
;
402397
expr_list

‎src/stringify.js‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
if (!sqlParser) {
2+
sqlParser = {};
3+
}
4+
5+
function Sql() {
6+
this.buffer = '';
7+
}
8+
9+
sqlParser.stringify = function (ast) {
10+
var sql = new Sql();
11+
sql.strigifyMain(ast);
12+
return sql.buffer;
13+
}
14+
15+
Sql.prototype.appendKeyword = function(keyword) {
16+
this.buffer += keyword.toUpperCase() + ' ';
17+
}
18+
Sql.prototype.append = function(word) {
19+
this.buffer += word + ' ';
20+
}
21+
Sql.prototype.strigifyMain = function(ast) {
22+
this.stringifySelectClause(ast.value);
23+
}
24+
Sql.prototype.stringifySelectClause = function(ast) {
25+
this.appendKeyword('select');
26+
if (ast.distinctOpt) {
27+
this.appendKeyword(ast.distinctOpt);
28+
}
29+
if (ast.highPriorityOpt) {
30+
this.appendKeyword(ast.highPriorityOpt);
31+
}
32+
if (ast.maxStateMentTimeOpt) {
33+
this.append('MAX_STATEMENT_TIME = ' + ast.maxStateMentTimeOpt);
34+
}
35+
if (ast.straightJoinOpt) {
36+
this.appendKeyword(ast.straightJoinOpt);
37+
}
38+
if (ast.sqlSmallResultOpt) {
39+
this.appendKeyword(ast.sqlSmallResultOpt);
40+
}
41+
if (ast.sqlBigResultOpt) {
42+
this.appendKeyword(ast.sqlBigResultOpt);
43+
}
44+
if (ast.sqlBufferResultOpt) {
45+
this.appendKeyword(ast.sqlBufferResultOpt);
46+
}
47+
if (ast.sqlCacheOpt) {
48+
this.appendKeyword(ast.sqlCacheOpt);
49+
}
50+
if (ast.sqlCalcFoundRowsOpt) {
51+
this.appendKeyword(ast.sqlCalcFoundRowsOpt);
52+
}
53+
if (ast.selectItems) {
54+
this.stringifySelectItems(ast.selectItems);
55+
}
56+
}
57+
Sql.prototype.stringifySelectItems = function (ast) {
58+
var exprList = ast.value;
59+
for (var i = 0; i < exprList.length; i++) {
60+
this.stringifySelectExpr(exprList[i]);
61+
if (i > 0) {
62+
this.append(',');
63+
}
64+
}
65+
}
66+
Sql.prototype.stringifySelectExpr = function (ast) {
67+
if (typeof ast === 'string') {
68+
return this.append(ast);
69+
}
70+
this.stringifyExpr(ast);
71+
if (ast.alias) {
72+
if (ast.hasAs) {
73+
this.appendKeyword('as');
74+
}
75+
this.append(ast.alias);
76+
}
77+
}
78+
Sql.prototype.stringifyExpr = function (ast) {
79+
switch (ast.type) {
80+
case 'IsExpression':
81+
this.stringifyBooleanPrimary(ast);
82+
this.appendKeyword('in');
83+
if (ast.hasNot) {
84+
this.appendKeyword('not');
85+
}
86+
this.append(ast.right.value);
87+
break;
88+
case 'NotExpression':
89+
this.appendKeyword('not');
90+
this.stringifyExpr(ast.value);
91+
break;
92+
case 'OrExpression':
93+
case 'AndExpression':
94+
case 'XORExpression':
95+
this.stringifyExpr(ast.left);
96+
this.appendKeyword(ast.operator);
97+
this.stringifyExpr(ast.right);
98+
break;
99+
default:
100+
this.stringifyBooleanPrimary(ast);
101+
break;
102+
}
103+
}
104+
Sql.prototype.stringifyBooleanPrimary = function () {
105+
;
106+
}
107+

‎src/suffix.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
var root = this
32
// AMD / RequireJS
43
if (typeof define !== 'undefined' && define.amd) {

‎test/main.test.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ const testParser = function (sql) {
1010
console.log(
1111
JSON.stringify(ast, null, 2)
1212
);
13+
console.log(
14+
parser.stringify(ast)
15+
);
1316
}
1417

1518
return ast;
@@ -54,15 +57,17 @@ describe('simple sql support', function () {
5457

5558
it ('test6', function () {
5659
testParser(`
57-
SELECT fm_customer.lname AS 名字1,
58-
fm_customer.fname AS 名字2,
59-
fm_customer.address1 AS 地址1,fm_customer.phone1 AS 电话1,fm_customer.yearly_income AS 年收入,fm_customer.num_cars_owned AS 拥有车辆数 FROM fm_customer inner join fm_sales_link on fm_customer.customer_id = fm_sales_link.fm_customer.customer_id AND fm_sales_link.store_sales IS NOT NULL\nAND fm_sales_link.store_cost IS NOT NULL\nAND fm_sales_link.unit_sales IS NOT NULL inner join fm_store on fm_sales_link.fm_store.store_id = fm_store.store_id AND fm_store.store_name IS NOT NULL
60+
select in中文 from tags
6061
`);
6162
});
6263

6364
it ('test7', function () {
6465
testParser(`
65-
select in中文 from tags
66+
SELECT distinct high_priority MAX_STATEMENT_TIME=1 STRAIGHT_JOIN SQL_SMALL_RESULT
67+
SQL_BIG_RESULT SQL_BUFFER_RESULT SQL_CACHE SQL_CALC_FOUND_ROWS
68+
fm_customer.lname AS 名字1,
69+
fm_customer.fname AS 名字2,
70+
fm_customer.address1 AS 地址1,fm_customer.phone1 AS 电话1,fm_customer.yearly_income AS 年收入,fm_customer.num_cars_owned AS 拥有车辆数 FROM fm_customer inner join fm_sales_link on fm_customer.customer_id = fm_sales_link.fm_customer.customer_id AND fm_sales_link.store_sales IS NOT NULL\nAND fm_sales_link.store_cost IS NOT NULL\nAND fm_sales_link.unit_sales IS NOT NULL inner join fm_store on fm_sales_link.fm_store.store_id = fm_store.store_id AND fm_store.store_name IS NOT NULL
6671
`);
6772
});
6873
});

0 commit comments

Comments
 (0)