Skip to content

Commit c4b1c55

Browse files
gpittarelligpittarelli
committed
Implement UPDATE
1 parent 5b7433f commit c4b1c55

File tree

3 files changed

+111
-12
lines changed

3 files changed

+111
-12
lines changed

‎src/sqlParser.jison‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[-][-]\s.*\n /* skip sql comments */
1111
[#]\s.*\n /* skip sql comments */
1212
\s+ /* skip whitespace */
13-
13+
1414
[`][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*[`] return 'IDENTIFIER'
1515
[\w]+[\u4e00-\u9fa5]+[0-9a-zA-Z_\u4e00-\u9fa5]* return 'IDENTIFIER'
1616
[\u4e00-\u9fa5][0-9a-zA-Z_\u4e00-\u9fa5]* return 'IDENTIFIER'
@@ -66,6 +66,7 @@ JOIN return 'JOIN'
6666
ORDER\s+BY return 'ORDER_BY'
6767
GROUP\s+BY return 'GROUP_BY'
6868
IGNORE return 'IGNORE'
69+
LOW_PRIORITY return 'LOW_PRIORITY'
6970
FORCE return 'FORCE'
7071
INNER return 'INNER'
7172
CROSS return 'CROSS'
@@ -82,6 +83,7 @@ WITH return 'WITH'
8283
ROLLUP return 'ROLLUP'
8384
HAVING return 'HAVING'
8485
OFFSET return 'OFFSET'
86+
SET return 'SET'
8587
PROCEDURE return 'PROCEDURE'
8688
UPDATE return 'UPDATE'
8789
LOCK return 'LOCK'
@@ -116,7 +118,7 @@ LIMIT return 'LIMIT'
116118
"{" return '{'
117119
"}" return '}'
118120
";" return ';'
119-
121+
120122
['](\\.|[^'])*['] return 'STRING'
121123
["](\\.|[^"])*["] return 'STRING'
122124
[0][x][0-9a-fA-F]+ return 'HEX_NUMERIC'
@@ -126,7 +128,7 @@ LIMIT return 'LIMIT'
126128
[a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]* return 'IDENTIFIER'
127129
\. return 'DOT'
128130
['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["'] return 'QUOTED_IDENTIFIER'
129-
131+
130132
<<EOF>> return 'EOF'
131133
. return 'INVALID'
132134

@@ -159,12 +161,58 @@ LIMIT return 'LIMIT'
159161
%% /* language grammar */
160162

161163
main
162-
: selectClause EOF { return {nodeType: 'Main', value: $1}; }
163-
| selectClause ';' EOF { return {nodeType: 'Main', value: $1, hasSemicolon: true}; }
164+
: query EOF { return {nodeType: 'Main', value: $1}; }
165+
| query ';' EOF { return {nodeType: 'Main', value: $1, hasSemicolon: true}; }
166+
;
167+
168+
query
169+
: selectClause
170+
| updateClause
171+
;
172+
173+
updateClause
174+
: UPDATE low_priority_opt ignore_opt
175+
table_refrences
176+
SET
177+
assignmentList
178+
where_opt
179+
order_by_opt
180+
limit_opt
181+
{
182+
$$ = {
183+
type: 'Update',
184+
lowPriority: $2,
185+
ignore: $3,
186+
tables: $4,
187+
assignments: $6,
188+
where: $7,
189+
orderBy: $8,
190+
limit: $9
191+
}
192+
}
193+
;
194+
195+
low_priority_opt
196+
: { $$ = null }
197+
| LOW_PRIORITY { $$ = $1 }
198+
;
199+
200+
ignore_opt
201+
: { $$ = null }
202+
| IGNORE { $$ = $1 }
203+
;
204+
205+
assignment
206+
: identifier '=' expr { $$ = { type: 'Assignment', left: $1, right: $3 } }
207+
;
208+
209+
assignmentList
210+
: assignmentList ',' assignment { $1.value.push($3); }
211+
| assignment { $$ = { type: 'AssignmentList', value: [ $1 ] } }
164212
;
165213

166214
selectClause
167-
: SELECT
215+
: SELECT
168216
distinctOpt
169217
highPriorityOpt
170218
maxStateMentTimeOpt
@@ -203,7 +251,7 @@ selectClause
203251
;
204252

205253
distinctOpt
206-
: ALL { $$ = $1 }
254+
: ALL { $$ = $1 }
207255
| DISTINCT { $$ = $1 }
208256
| DISTINCTROW { $$ = $1 }
209257
| { $$ = null }
@@ -336,7 +384,7 @@ simple_expr
336384
;
337385
bit_expr
338386
: simple_expr { $$ = $1 }
339-
| bit_expr '|' bit_expr { $$ = { type: 'BitExpression', operator: '|', left: $1, right: $3 } }
387+
| bit_expr '|' bit_expr { $$ = { type: 'BitExpression', operator: '|', left: $1, right: $3 } }
340388
| bit_expr '&' bit_expr { $$ = { type: 'BitExpression', operator: '&', left: $1, right: $3 } }
341389
| bit_expr '<<' bit_expr { $$ = { type: 'BitExpression', operator: '<<', left: $1, right: $3 } }
342390
| bit_expr '>>' bit_expr { $$ = { type: 'BitExpression', operator: '>>', left: $1, right: $3 } }

‎src/stringify.js‎

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ Sql.prototype.append = function(word, noPrefix, noSuffix) {
5555
}
5656
}
5757
Sql.prototype.travelMain = function(ast) {
58-
this.travelSelect(ast.value);
58+
if (ast.value.type === 'Select') {
59+
this.travelSelect(ast.value);
60+
} else if (ast.value.type === 'Update') {
61+
this.travelUpdate(ast.value);
62+
} else {
63+
throw new Error('Unknown query value type');
64+
}
5965
if (ast.hasSemicolon) {
6066
this.append(';', true);
6167
}
@@ -123,6 +129,40 @@ Sql.prototype.travelSelect = function(ast) {
123129
this.appendKeyword(ast.updateLockMode);
124130
}
125131
}
132+
Sql.prototype.travelUpdate = function(ast) {
133+
this.appendKeyword('update', true);
134+
if (ast.lowPriority) {
135+
this.appendKeyword('low_priority');
136+
}
137+
if (ast.ignore) {
138+
this.appendKeyword('ignore');
139+
}
140+
this.travelTableRefrences(ast.tables);
141+
this.appendKeyword('set');
142+
this.travelAssignments(ast.assignments);
143+
if (ast.where) {
144+
this.appendKeyword('where');
145+
this.travel(ast.where);
146+
}
147+
if (ast.orderBy) {
148+
this.travel(ast.orderBy);
149+
}
150+
if (ast.limit) {
151+
this.travel(ast.limit);
152+
}
153+
}
154+
Sql.prototype.travelAssignments = function(ast) {
155+
for (var i = 0; i < ast.value.length; i++) {
156+
var x = ast.value[i];
157+
this.travelIdentifier(x.left);
158+
this.travel('=');
159+
this.travelIdentifier(x.right);
160+
161+
if (i !== ast.value.length - 1) {
162+
this.append(',', true);
163+
}
164+
}
165+
}
126166
Sql.prototype.travelSelectExpr = function (ast) {
127167
var exprList = ast.value;
128168
for (var i = 0; i < exprList.length; i++) {
@@ -161,8 +201,8 @@ Sql.prototype.travelXORExpression = function (ast) {
161201
this.appendKeyword(ast.operator);
162202
this.travel(ast.right);
163203
}
164-
Sql.prototype.travelNull =
165-
Sql.prototype.travelBoolean =
204+
Sql.prototype.travelNull =
205+
Sql.prototype.travelBoolean =
166206
Sql.prototype.travelBooleanExtra = function (ast) {
167207
this.appendKeyword(ast.value);
168208
}

‎test/main.test.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,16 @@ AND (rd.rd_numberofrooms <= (select sum(rn.reservation_numberofrooms) as count_r
136136
it ('restore semicolon.', function () {
137137
testParser('select a from b limit 2;');
138138
});
139-
});
140139

140+
it('update0', function () {
141+
testParser('update A SET b=2 WHERE c=3;');
142+
});
143+
144+
it('update1', function () {
145+
testParser('update LOW_PRIORITY ignore A SET b=2, c=d WHERE e=4 ORDER BY d DESC limit 1;');
146+
});
147+
148+
it('update2', function () {
149+
testParser('update LOW_PRIORITY ignore A, B, C SET b=2, `C`.c=d WHERE e=4 ORDER BY d DESC limit 1;');
150+
});
151+
});

0 commit comments

Comments
 (0)