Skip to content

Commit 11f26f8

Browse files
laojianzilaojianzi
authored
Fix the "=" operator should be present if the setting variable carries a value (#80)
1 parent 55470ef commit 11f26f8

File tree

8 files changed

+84
-27
lines changed

8 files changed

+84
-27
lines changed

‎parser/ast.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,8 +1799,9 @@ func (r *RoleName) Accept(visitor ASTVisitor) error {
17991799
}
18001800

18011801
type SettingPair struct {
1802-
Name *Ident
1803-
Value Expr
1802+
Name *Ident
1803+
Operation TokenKind
1804+
Value Expr
18041805
}
18051806

18061807
func (s *SettingPair) Pos() Pos {
@@ -1815,7 +1816,11 @@ func (s *SettingPair) String(level int) string {
18151816
var builder strings.Builder
18161817
builder.WriteString(s.Name.String(level))
18171818
if s.Value != nil {
1818-
builder.WriteByte(' ')
1819+
if s.Operation == opTypeEQ {
1820+
builder.WriteString(string(s.Operation))
1821+
} else {
1822+
builder.WriteByte(' ')
1823+
}
18191824
builder.WriteString(s.Value.String(level))
18201825
}
18211826
return builder.String()

‎parser/parse_system.go‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,18 +404,28 @@ func (p *Parser) parseRoleSetting(_ Pos) (*RoleSetting, error) {
404404
}, nil
405405
}
406406
switch {
407-
case p.matchTokenKind("="),
407+
case p.matchTokenKind(opTypeEQ),
408408
p.matchTokenKind(TokenInt),
409409
p.matchTokenKind(TokenFloat),
410410
p.matchTokenKind(TokenString):
411-
_ = p.tryConsumeTokenKind("=")
411+
var op TokenKind
412+
if token := p.tryConsumeTokenKind(opTypeEQ); token != nil {
413+
op = token.Kind
414+
}
412415
value, err := p.parseLiteral(p.Pos())
413416
if err != nil {
414417
return nil, err
415418
}
419+
// docs: https://clickhouse.com/docs/en/sql-reference/statements/alter/role
420+
// the operator "=" was required if the variable name is NOT in
421+
// ["MIN", "MAX", "PROFILE"] and value is existed.
422+
if value != nil && name.Name != "MIN" && name.Name != "MAX" && name.Name != "PROFILE" && op != opTypeEQ {
423+
return nil, fmt.Errorf("expected operator = or no value, but got %s", op)
424+
}
416425
pairs = append(pairs, &SettingPair{
417-
Name: name,
418-
Value: value,
426+
Name: name,
427+
Operation: op,
428+
Value: value,
419429
})
420430
default:
421431
pairs = append(pairs, &SettingPair{

‎parser/parser_column.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ func (p *Parser) parseColumnType(_ Pos) (Expr, error) { // nolint:funlen
666666
}
667667
return p.parseComplexType(ident, p.Pos())
668668
case p.matchTokenKind(TokenString):
669-
if peekToken, err := p.lexer.peekToken(); err == nil && peekToken.Kind == "=" {
669+
if peekToken, err := p.lexer.peekToken(); err == nil && peekToken.Kind == opTypeEQ {
670670
// enum values
671671
return p.parseEnumExpr(p.Pos())
672672
}
@@ -855,7 +855,7 @@ func (p *Parser) parseEnumValueExpr(pos Pos) (*EnumValue, error) {
855855
return nil, err
856856
}
857857

858-
if _, err := p.consumeTokenKind("="); err != nil {
858+
if _, err := p.consumeTokenKind(opTypeEQ); err != nil {
859859
return nil, err
860860
}
861861

‎parser/parser_table.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ func (p *Parser) parseSettingsExprList(pos Pos) (*SettingExprList, error) {
773773
return nil, err
774774
}
775775

776-
if _, err := p.consumeTokenKind("="); err != nil {
776+
if _, err := p.consumeTokenKind(opTypeEQ); err != nil {
777777
return nil, err
778778
}
779779

@@ -842,7 +842,7 @@ func (p *Parser) parseEngineExpr(pos Pos) (*EngineExpr, error) {
842842
if err := p.consumeKeyword(KeywordEngine); err != nil {
843843
return nil, err
844844
}
845-
_ = p.tryConsumeTokenKind("=")
845+
_ = p.tryConsumeTokenKind(opTypeEQ)
846846

847847
engineExpr := &EngineExpr{EnginePos: pos}
848848
var engineEnd Pos

‎parser/testdata/ddl/format/alter_role.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ ALTER ROLE r1_01293 ON CLUSTER cluster_1 RENAME TO r2_01293;
2828
ALTER ROLE r1_01293 RENAME TO r2_01293, r3_01293 RENAME TO r4_01293;
2929
ALTER ROLE r1_01293 SETTINGS NONE;
3030
ALTER ROLE r2_01293 SETTINGS PROFILE 'default';
31-
ALTER ROLE r3_01293 SETTINGS max_memory_usage 5000000;
32-
ALTER ROLE r4_01293 SETTINGS max_memory_usage MIN 5000000;
33-
ALTER ROLE r5_01293 SETTINGS max_memory_usage MAX 5000000;
31+
ALTER ROLE r3_01293 SETTINGS max_memory_usage=5000000;
32+
ALTER ROLE r4_01293 SETTINGS max_memory_usage MIN=5000000;
33+
ALTER ROLE r5_01293 SETTINGS max_memory_usage MAX=5000000;
3434
ALTER ROLE r6_01293 SETTINGS max_memory_usage CONST;
3535
ALTER ROLE r7_01293 SETTINGS max_memory_usage WRITABLE;
36-
ALTER ROLE r8_01293 SETTINGS max_memory_usage 5000000 MIN 4000000 MAX 6000000 CONST;
37-
ALTER ROLE r9_01293 SETTINGS PROFILE 'default', max_memory_usage 5000000 WRITABLE;
36+
ALTER ROLE r8_01293 SETTINGS max_memory_usage=5000000 MIN 4000000 MAX 6000000 CONST;
37+
ALTER ROLE r9_01293 SETTINGS PROFILE 'default', max_memory_usage=5000000 WRITABLE;
3838
ALTER ROLE r1_01293, r2_01293;
39-
ALTER ROLE r1_01293 SETTINGS readonly 1;
39+
ALTER ROLE r1_01293 SETTINGS readonly=1;
4040
ALTER ROLE r2_01293 SETTINGS PROFILE 'default';
41-
ALTER ROLE r3_01293 SETTINGS max_memory_usage 5000000 MIN 4000000 MAX 6000000 WRITABLE;
42-
ALTER ROLE r4_01293 SETTINGS PROFILE 'default', max_memory_usage 5000000, readonly 1;
41+
ALTER ROLE r3_01293 SETTINGS max_memory_usage=5000000 MIN 4000000 MAX 6000000 WRITABLE;
42+
ALTER ROLE r4_01293 SETTINGS PROFILE 'default', max_memory_usage=5000000, readonly=1;
4343
ALTER ROLE r5_01293 SETTINGS NONE;
4444
ALTER ROLE r1_01293@'%';
4545
ALTER ROLE r2_01293@'%.myhost.com';

‎parser/testdata/ddl/format/create_role.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ CREATE ROLE r1_01293 ON CLUSTER cluster_1, r2_01293;
3232
CREATE ROLE r1_01293 ON CLUSTER cluster_1, r2_01293 ON CLUSTER cluster_2;
3333
CREATE ROLE r1_01293 SETTINGS NONE;
3434
CREATE ROLE r2_01293 SETTINGS PROFILE 'default';
35-
CREATE ROLE r3_01293 SETTINGS max_memory_usage 5000000;
36-
CREATE ROLE r4_01293 SETTINGS max_memory_usage MIN 5000000;
37-
CREATE ROLE r5_01293 SETTINGS max_memory_usage MAX 5000000;
35+
CREATE ROLE r3_01293 SETTINGS max_memory_usage=5000000;
36+
CREATE ROLE r4_01293 SETTINGS max_memory_usage MIN=5000000;
37+
CREATE ROLE r5_01293 SETTINGS max_memory_usage MAX=5000000;
3838
CREATE ROLE r6_01293 SETTINGS max_memory_usage CONST;
3939
CREATE ROLE r7_01293 SETTINGS max_memory_usage WRITABLE;
40-
CREATE ROLE r8_01293 SETTINGS max_memory_usage 5000000 MIN 4000000 MAX 6000000 CONST;
41-
CREATE ROLE r9_01293 SETTINGS PROFILE 'default', max_memory_usage 5000000 WRITABLE;
40+
CREATE ROLE r8_01293 SETTINGS max_memory_usage=5000000 MIN 4000000 MAX 6000000 CONST;
41+
CREATE ROLE r9_01293 SETTINGS PROFILE 'default', max_memory_usage=5000000 WRITABLE;
4242
CREATE ROLE r1_01293, r2_01293;
43-
CREATE ROLE r1_01293 SETTINGS readonly 1;
43+
CREATE ROLE r1_01293 SETTINGS readonly=1;
4444
CREATE ROLE r2_01293 SETTINGS PROFILE 'default';
45-
CREATE ROLE r3_01293 SETTINGS max_memory_usage 5000000 MIN 4000000 MAX 6000000 WRITABLE;
46-
CREATE ROLE r4_01293 SETTINGS PROFILE 'default', max_memory_usage 5000000, readonly 1;
45+
CREATE ROLE r3_01293 SETTINGS max_memory_usage=5000000 MIN 4000000 MAX 6000000 WRITABLE;
46+
CREATE ROLE r4_01293 SETTINGS PROFILE 'default', max_memory_usage=5000000, readonly=1;
4747
CREATE ROLE r5_01293 SETTINGS NONE;
4848
CREATE ROLE r1_01293@'%';
4949
CREATE ROLE r2_01293@'%.myhost.com';

‎parser/testdata/ddl/output/alter_role.sql.golden.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
"NamePos": 237,
165165
"NameEnd": 244
166166
},
167+
"Operation": "",
167168
"Value": {
168169
"LiteralPos": 246,
169170
"LiteralEnd": 253,
@@ -205,6 +206,7 @@
205206
"NamePos": 285,
206207
"NameEnd": 301
207208
},
209+
"Operation": "=",
208210
"Value": {
209211
"NumPos": 302,
210212
"NumEnd": 309,
@@ -247,6 +249,7 @@
247249
"NamePos": 340,
248250
"NameEnd": 356
249251
},
252+
"Operation": "",
250253
"Value": null
251254
},
252255
{
@@ -256,6 +259,7 @@
256259
"NamePos": 357,
257260
"NameEnd": 360
258261
},
262+
"Operation": "=",
259263
"Value": {
260264
"NumPos": 361,
261265
"NumEnd": 368,
@@ -298,6 +302,7 @@
298302
"NamePos": 399,
299303
"NameEnd": 415
300304
},
305+
"Operation": "",
301306
"Value": null
302307
},
303308
{
@@ -307,6 +312,7 @@
307312
"NamePos": 416,
308313
"NameEnd": 419
309314
},
315+
"Operation": "=",
310316
"Value": {
311317
"NumPos": 420,
312318
"NumEnd": 427,
@@ -349,6 +355,7 @@
349355
"NamePos": 458,
350356
"NameEnd": 474
351357
},
358+
"Operation": "",
352359
"Value": null
353360
}
354361
],
@@ -391,6 +398,7 @@
391398
"NamePos": 511,
392399
"NameEnd": 527
393400
},
401+
"Operation": "",
394402
"Value": null
395403
}
396404
],
@@ -433,6 +441,7 @@
433441
"NamePos": 567,
434442
"NameEnd": 583
435443
},
444+
"Operation": "=",
436445
"Value": {
437446
"NumPos": 584,
438447
"NumEnd": 591,
@@ -447,6 +456,7 @@
447456
"NamePos": 592,
448457
"NameEnd": 595
449458
},
459+
"Operation": "",
450460
"Value": {
451461
"NumPos": 596,
452462
"NumEnd": 603,
@@ -461,6 +471,7 @@
461471
"NamePos": 604,
462472
"NameEnd": 607
463473
},
474+
"Operation": "",
464475
"Value": {
465476
"NumPos": 608,
466477
"NumEnd": 615,
@@ -508,6 +519,7 @@
508519
"NamePos": 652,
509520
"NameEnd": 659
510521
},
522+
"Operation": "",
511523
"Value": {
512524
"LiteralPos": 661,
513525
"LiteralEnd": 668,
@@ -526,6 +538,7 @@
526538
"NamePos": 671,
527539
"NameEnd": 687
528540
},
541+
"Operation": "=",
529542
"Value": {
530543
"NumPos": 688,
531544
"NumEnd": 695,
@@ -609,6 +622,7 @@
609622
"NamePos": 766,
610623
"NameEnd": 774
611624
},
625+
"Operation": "=",
612626
"Value": {
613627
"NumPos": 775,
614628
"NumEnd": 776,
@@ -651,6 +665,7 @@
651665
"NamePos": 807,
652666
"NameEnd": 814
653667
},
668+
"Operation": "",
654669
"Value": {
655670
"LiteralPos": 816,
656671
"LiteralEnd": 823,
@@ -692,6 +707,7 @@
692707
"NamePos": 855,
693708
"NameEnd": 871
694709
},
710+
"Operation": "=",
695711
"Value": {
696712
"NumPos": 872,
697713
"NumEnd": 879,
@@ -706,6 +722,7 @@
706722
"NamePos": 880,
707723
"NameEnd": 883
708724
},
725+
"Operation": "",
709726
"Value": {
710727
"NumPos": 884,
711728
"NumEnd": 891,
@@ -720,6 +737,7 @@
720737
"NamePos": 892,
721738
"NameEnd": 895
722739
},
740+
"Operation": "",
723741
"Value": {
724742
"NumPos": 896,
725743
"NumEnd": 903,
@@ -767,6 +785,7 @@
767785
"NamePos": 943,
768786
"NameEnd": 950
769787
},
788+
"Operation": "",
770789
"Value": {
771790
"LiteralPos": 952,
772791
"LiteralEnd": 959,
@@ -785,6 +804,7 @@
785804
"NamePos": 962,
786805
"NameEnd": 978
787806
},
807+
"Operation": "=",
788808
"Value": {
789809
"NumPos": 979,
790810
"NumEnd": 986,
@@ -804,6 +824,7 @@
804824
"NamePos": 988,
805825
"NameEnd": 996
806826
},
827+
"Operation": "=",
807828
"Value": {
808829
"NumPos": 997,
809830
"NumEnd": 998,

0 commit comments

Comments
 (0)