Skip to content

Commit 973c119

Browse files
mattnmattn
authored
Merge pull request #129 from mattn/fix-typo-quote
fix typos
2 parents 298f581 + 9006a82 commit 973c119

File tree

10 files changed

+41
-41
lines changed

10 files changed

+41
-41
lines changed

‎ast/ast.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const (
2929

3030
type RenderOptions struct {
3131
LowerCase bool
32-
IdentifierQuated bool
32+
IdentifierQuoted bool
3333
}
3434

3535
type Node interface {
@@ -67,7 +67,7 @@ func NewItem(tok *token.Token) Node {
6767
return &Item{NewSQLToken(tok)}
6868
}
6969
func (i *Item) String() string { return i.Tok.String() }
70-
func (i *Item) NoQuateString() string { return i.Tok.NoQuateString() }
70+
func (i *Item) NoQuoteString() string { return i.Tok.NoQuoteString() }
7171
func (i *Item) Render(opts *RenderOptions) string { return i.Tok.Render(opts) }
7272
func (i *Item) Type() NodeType { return TypeItem }
7373
func (i *Item) GetToken() *SQLToken { return i.Tok }
@@ -241,11 +241,11 @@ func (i *Identifier) String() string { return i.Tok.String() }
241241
func (i *Identifier) Render(opts *RenderOptions) string {
242242
tmpOpts := &RenderOptions{
243243
LowerCase: false,
244-
IdentifierQuated: opts.IdentifierQuated,
244+
IdentifierQuoted: opts.IdentifierQuoted,
245245
}
246246
return i.Tok.Render(tmpOpts)
247247
}
248-
func (i *Identifier) NoQuateString() string { return i.Tok.NoQuateString() }
248+
func (i *Identifier) NoQuoteString() string { return i.Tok.NoQuoteString() }
249249
func (i *Identifier) GetToken() *SQLToken { return i.Tok }
250250
func (i *Identifier) Pos() token.Pos { return i.Tok.From }
251251
func (i *Identifier) End() token.Pos { return i.Tok.To }
@@ -523,10 +523,10 @@ func (t *SQLToken) String() string {
523523
}
524524
}
525525

526-
func (t *SQLToken) NoQuateString() string {
526+
func (t *SQLToken) NoQuoteString() string {
527527
switch v := t.Value.(type) {
528528
case *token.SQLWord:
529-
return v.NoQuateString()
529+
return v.NoQuoteString()
530530
case string:
531531
return v
532532
default:
@@ -548,7 +548,7 @@ func (t *SQLToken) Render(opts *RenderOptions) string {
548548
func renderSQLWord(v *token.SQLWord, opts *RenderOptions) string {
549549
isIdentifier := v.Kind == dialect.Unmatched
550550
if isIdentifier {
551-
if opts.IdentifierQuated {
551+
if opts.IdentifierQuoted {
552552
v.QuoteStyle = '`'
553553
return v.String()
554554
}

‎internal/completer/completer.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ func getCompletionTypes(nw *parseutil.NodeWalker) *CompletionContext {
317317
}
318318
p = &completionParent{
319319
Type: ParentTypeTable,
320-
Name: mi.ParentTok.NoQuateString(),
320+
Name: mi.ParentTok.NoQuoteString(),
321321
}
322322
} else {
323323
t = []completionType{
@@ -341,7 +341,7 @@ func getCompletionTypes(nw *parseutil.NodeWalker) *CompletionContext {
341341
}
342342
p = &completionParent{
343343
Type: ParentTypeSchema,
344-
Name: mi.ParentTok.NoQuateString(),
344+
Name: mi.ParentTok.NoQuoteString(),
345345
}
346346
} else {
347347
t = []completionType{
@@ -363,7 +363,7 @@ func getCompletionTypes(nw *parseutil.NodeWalker) *CompletionContext {
363363
}
364364
p = &completionParent{
365365
Type: ParentTypeTable,
366-
Name: mi.ParentTok.NoQuateString(),
366+
Name: mi.ParentTok.NoQuoteString(),
367367
}
368368
} else {
369369
t = []completionType{

‎internal/formatter/formatter_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestRenderIdentifier(t *testing.T) {
5050
input: "SELECT * FROM snake_case_table_name",
5151
opts: &ast.RenderOptions{
5252
LowerCase: false,
53-
IdentifierQuated: false,
53+
IdentifierQuoted: false,
5454
},
5555
expected: []string{
5656
"*",
@@ -62,7 +62,7 @@ func TestRenderIdentifier(t *testing.T) {
6262
input: "SELECT p.PascalCaseColumnName FROM \"PascalCaseTableName\" p",
6363
opts: &ast.RenderOptions{
6464
LowerCase: false,
65-
IdentifierQuated: false,
65+
IdentifierQuoted: false,
6666
},
6767
expected: []string{
6868
"p.PascalCaseColumnName",
@@ -74,7 +74,7 @@ func TestRenderIdentifier(t *testing.T) {
7474
input: "SELECT p.\"PascalCaseColumnName\" FROM \"PascalCaseTableName\" p",
7575
opts: &ast.RenderOptions{
7676
LowerCase: false,
77-
IdentifierQuated: false,
77+
IdentifierQuoted: false,
7878
},
7979
expected: []string{
8080
"p.\"PascalCaseColumnName\"",

‎internal/handler/completion_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ var selectExprCase = []completionTestCase{
148148
},
149149
},
150150
{
151-
name: "filtered single quate table columns",
151+
name: "filtered single quote table columns",
152152
input: "select `Cou from city",
153153
line: 0,
154154
col: 10,

‎internal/handler/hover.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ func hover(text string, params lsp.HoverParams, dbCache *database.DBCache) (*lsp
8383
// Create hover contents
8484
var hoverContent *lsp.MarkupContent
8585
if ident != nil && memIdent != nil {
86-
identName := ident.NoQuateString()
87-
parentName := memIdent.ParentTok.NoQuateString()
88-
childName := memIdent.ChildTok.NoQuateString()
86+
identName := ident.NoQuoteString()
87+
parentName := memIdent.ParentTok.NoQuoteString()
88+
childName := memIdent.ChildTok.NoQuoteString()
8989
if identName == parentName {
9090
// The cursor is on the member identifier parent.
9191
// example "w[o]rld.city"
@@ -101,11 +101,11 @@ func hover(text string, params lsp.HoverParams, dbCache *database.DBCache) (*lsp
101101
} else if ident == nil && memIdent != nil {
102102
// The cursor is on the dot with the member identifier
103103
// example "world[.]city"
104-
hoverContent = hoverContentFromChildIdent(ctx, memIdent.ChildTok.NoQuateString(), dbCache, hoverEnv)
104+
hoverContent = hoverContentFromChildIdent(ctx, memIdent.ChildTok.NoQuoteString(), dbCache, hoverEnv)
105105
} else if ident != nil && memIdent == nil {
106106
// The cursor is on the identifier
107107
// example "c[i]ty"
108-
hoverContent = hoverContentFromIdent(ctx, ident.NoQuateString(), dbCache, hoverEnv)
108+
hoverContent = hoverContentFromIdent(ctx, ident.NoQuoteString(), dbCache, hoverEnv)
109109
}
110110
if hoverContent == nil {
111111
return nil, ErrNoHover

‎internal/handler/hover_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ var hoverTestCases = []struct {
5252
col: 15,
5353
},
5454
{
55-
name: "select quated ident head",
55+
name: "select quoted ident head",
5656
input: "SELECT `ID`, Name FROM city",
5757
output: "`city`.`ID` column\n\n`int(11)` PRI auto_increment\n",
5858
line: 0,
5959
col: 8,
6060
},
6161
{
62-
name: "select quated ident head",
62+
name: "select quoted ident head",
6363
input: "SELECT `ID`, Name FROM city",
6464
output: "`city`.`ID` column\n\n`int(11)` PRI auto_increment\n",
6565
line: 0,

‎parser/parser_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func TestParseIdentifier(t *testing.T) {
321321
},
322322
},
323323
{
324-
name: "double quate identifier",
324+
name: "double quote identifier",
325325
input: `"abc"`,
326326
checkFn: func(t *testing.T, stmts []*ast.Statement, input string) {
327327
testStatement(t, stmts[0], 1, input)
@@ -330,7 +330,7 @@ func TestParseIdentifier(t *testing.T) {
330330
},
331331
},
332332
{
333-
name: "back quate identifier",
333+
name: "back quote identifier",
334334
input: "`abc`",
335335
checkFn: func(t *testing.T, stmts []*ast.Statement, input string) {
336336
testStatement(t, stmts[0], 1, input)
@@ -339,7 +339,7 @@ func TestParseIdentifier(t *testing.T) {
339339
},
340340
},
341341
{
342-
name: "non close back quate identifier",
342+
name: "non close back quote identifier",
343343
input: "`abc",
344344
checkFn: func(t *testing.T, stmts []*ast.Statement, input string) {
345345
testStatement(t, stmts[0], 1, input)
@@ -407,7 +407,7 @@ func TestMemberIdentifier(t *testing.T) {
407407
},
408408
},
409409
{
410-
name: "double quate member identifier",
410+
name: "double quote member identifier",
411411
input: `"abc"."def"`,
412412
checkFn: func(t *testing.T, stmts []*ast.Statement, input string) {
413413
testStatement(t, stmts[0], 1, input)
@@ -416,7 +416,7 @@ func TestMemberIdentifier(t *testing.T) {
416416
},
417417
},
418418
{
419-
name: "back quate member identifier",
419+
name: "back quote member identifier",
420420
input: "`abc`.`def`",
421421
checkFn: func(t *testing.T, stmts []*ast.Statement, input string) {
422422
testStatement(t, stmts[0], 1, input)

‎parser/parseutil/parseutil.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ func parseTableInfo(idents ast.Node) ([]*TableInfo, error) {
382382
res := []*TableInfo{}
383383
switch v := idents.(type) {
384384
case *ast.Identifier:
385-
ti := &TableInfo{Name: v.NoQuateString()}
385+
ti := &TableInfo{Name: v.NoQuoteString()}
386386
res = append(res, ti)
387387
case *ast.IdentifierList:
388388
tis, err := identifierListToTableInfo(v)
@@ -416,7 +416,7 @@ func identifierListToTableInfo(il *ast.IdentifierList) ([]*TableInfo, error) {
416416
switch v := ident.(type) {
417417
case *ast.Identifier:
418418
ti := &TableInfo{
419-
Name: v.NoQuateString(),
419+
Name: v.NoQuoteString(),
420420
}
421421
tis = append(tis, ti)
422422
case *ast.MemberIdentifier:
@@ -439,7 +439,7 @@ func aliasedToTableInfo(aliased *ast.Aliased) (*TableInfo, error) {
439439
// fetch table schema and name
440440
switch v := aliased.RealName.(type) {
441441
case *ast.Identifier:
442-
ti.Name = v.NoQuateString()
442+
ti.Name = v.NoQuoteString()
443443
case *ast.MemberIdentifier:
444444
ti.DatabaseSchema = v.Parent.String()
445445
ti.Name = v.GetChild().String()
@@ -461,7 +461,7 @@ func aliasedToTableInfo(aliased *ast.Aliased) (*TableInfo, error) {
461461
// fetch table aliased name
462462
switch v := aliased.AliasedName.(type) {
463463
case *ast.Identifier:
464-
ti.Alias = v.NoQuateString()
464+
ti.Alias = v.NoQuoteString()
465465
default:
466466
return nil, fmt.Errorf(
467467
"failed parse aliased name of alias, unknown node type %T, value %q",
@@ -476,7 +476,7 @@ func parseSubQueryColumns(idents ast.Node, tables []*TableInfo) ([]*SubQueryColu
476476
subqueryCols := []*SubQueryColumn{}
477477
switch v := idents.(type) {
478478
case *ast.Identifier:
479-
ident := v.NoQuateString()
479+
ident := v.NoQuoteString()
480480
if ident == "*" {
481481
for _, table := range tables {
482482
subqueryCol := &SubQueryColumn{
@@ -504,8 +504,8 @@ func parseSubQueryColumns(idents ast.Node, tables []*TableInfo) ([]*SubQueryColu
504504
subqueryCols = append(
505505
subqueryCols,
506506
&SubQueryColumn{
507-
ParentName: v.GetParentIdent().NoQuateString(),
508-
ColumnName: v.GetChildIdent().NoQuateString(),
507+
ParentName: v.GetParentIdent().NoQuoteString(),
508+
ColumnName: v.GetChildIdent().NoQuoteString(),
509509
},
510510
)
511511
case *ast.Aliased:
@@ -532,18 +532,18 @@ func parseSubQueryColumns(idents ast.Node, tables []*TableInfo) ([]*SubQueryColu
532532

533533
func aliasedToSubQueryColumn(aliased *ast.Aliased) (*SubQueryColumn, error) {
534534
// fetch table schema and name
535-
aliasedName := aliased.GetAliasedNameIdent().NoQuateString()
535+
aliasedName := aliased.GetAliasedNameIdent().NoQuoteString()
536536
switch v := aliased.RealName.(type) {
537537
case *ast.Identifier:
538538
subqueryCol := &SubQueryColumn{
539-
ColumnName: v.NoQuateString(),
539+
ColumnName: v.NoQuoteString(),
540540
AliasName: aliasedName,
541541
}
542542
return subqueryCol, nil
543543
case *ast.MemberIdentifier:
544544
subqueryCol := &SubQueryColumn{
545-
ParentName: v.GetParentIdent().NoQuateString(),
546-
ColumnName: v.GetChildIdent().NoQuateString(),
545+
ParentName: v.GetParentIdent().NoQuoteString(),
546+
ColumnName: v.GetChildIdent().NoQuoteString(),
547547
AliasName: aliasedName,
548548
}
549549
return subqueryCol, nil

‎token/lexer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (s *SQLWord) String() string {
2828
}
2929
}
3030

31-
func (s *SQLWord) NoQuateString() string {
31+
func (s *SQLWord) NoQuoteString() string {
3232
return s.Value
3333
}
3434

‎token/lexer_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ select`,
327327
},
328328
},
329329
{
330-
name: "non closed single quate identifier",
330+
name: "non closed single quote identifier",
331331
in: "'foo",
332332
out: []*Token{
333333
{
@@ -339,7 +339,7 @@ select`,
339339
},
340340
},
341341
{
342-
name: "non closed double quate identifier",
342+
name: "non closed double quote identifier",
343343
in: `"foo`,
344344
out: []*Token{
345345
{
@@ -356,7 +356,7 @@ select`,
356356
},
357357
},
358358
{
359-
name: "non closed back quate identifier",
359+
name: "non closed back quote identifier",
360360
in: "`foo bar",
361361
out: []*Token{
362362
{

0 commit comments

Comments
 (0)