Skip to content

Commit 3e1b131

Browse files
committed
Unquote identifiers.
1 parent 83744cb commit 3e1b131

4 files changed

Lines changed: 78 additions & 53 deletions

File tree

‎ext/csv/schema.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ import (
99

1010
func getSchema(header bool, columns int, row []string) string {
1111
var sep string
12-
var str strings.Builder
13-
str.WriteString("CREATE TABLE x(")
12+
var buf strings.Builder
13+
buf.WriteString("CREATE TABLE x(")
1414

1515
if 0 <= columns && columns < len(row) {
1616
row = row[:columns]
1717
}
1818
for i, f := range row {
19-
str.WriteString(sep)
19+
buf.WriteString(sep)
2020
if header && f != "" {
21-
str.WriteString(sqlite3.QuoteIdentifier(f))
21+
buf.WriteString(sqlite3.QuoteIdentifier(f))
2222
} else {
23-
str.WriteString("c")
24-
str.WriteString(strconv.Itoa(i + 1))
23+
buf.WriteString("c")
24+
buf.WriteString(strconv.Itoa(i + 1))
2525
}
26-
str.WriteString(" TEXT")
26+
buf.WriteString(" TEXT")
2727
sep = ","
2828
}
2929
for i := len(row); i < columns; i++ {
30-
str.WriteString(sep)
31-
str.WriteString("c")
32-
str.WriteString(strconv.Itoa(i + 1))
33-
str.WriteString(" TEXT")
30+
buf.WriteString(sep)
31+
buf.WriteString("c")
32+
buf.WriteString(strconv.Itoa(i + 1))
33+
buf.WriteString(" TEXT")
3434
sep = ","
3535
}
36-
str.WriteByte(')')
36+
buf.WriteByte(')')
3737

38-
return str.String()
38+
return buf.String()
3939
}

‎ext/statement/stmt.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,34 +46,34 @@ func declare(db *sqlite3.Conn, _, _, _ string, arg ...string) (*table, error) {
4646
}
4747

4848
var sep string
49-
var str strings.Builder
50-
str.WriteString("CREATE TABLE x(")
49+
var buf strings.Builder
50+
buf.WriteString("CREATE TABLE x(")
5151
outputs := stmt.ColumnCount()
5252
for i := range outputs {
5353
name := sqlite3.QuoteIdentifier(stmt.ColumnName(i))
54-
str.WriteString(sep)
55-
str.WriteString(name)
56-
str.WriteString(" ")
57-
str.WriteString(stmt.ColumnDeclType(i))
54+
buf.WriteString(sep)
55+
buf.WriteString(name)
56+
buf.WriteString(" ")
57+
buf.WriteString(stmt.ColumnDeclType(i))
5858
sep = ","
5959
}
6060
inputs := stmt.BindCount()
6161
for i := 1; i <= inputs; i++ {
62-
str.WriteString(sep)
62+
buf.WriteString(sep)
6363
name := stmt.BindName(i)
6464
if name == "" {
65-
str.WriteString("[")
66-
str.WriteString(strconv.Itoa(i))
67-
str.WriteString("] HIDDEN")
65+
buf.WriteString("[")
66+
buf.WriteString(strconv.Itoa(i))
67+
buf.WriteString("] HIDDEN")
6868
} else {
69-
str.WriteString(sqlite3.QuoteIdentifier(name[1:]))
70-
str.WriteString(" HIDDEN")
69+
buf.WriteString(sqlite3.QuoteIdentifier(name[1:]))
70+
buf.WriteString(" HIDDEN")
7171
}
7272
sep = ","
7373
}
74-
str.WriteByte(')')
74+
buf.WriteByte(')')
7575

76-
err = db.DeclareVTab(str.String())
76+
err = db.DeclareVTab(buf.String())
7777
if err != nil {
7878
stmt.Close()
7979
return nil, err

‎util/sql3util/parse.go‎

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package sql3util
33
import (
44
"context"
55
_ "embed"
6+
"strings"
67
"sync"
78

89
"github.com/tetratelabs/wazero"
@@ -93,8 +94,8 @@ type Table struct {
9394
}
9495

9596
func (t *Table) load(mod api.Module, ptr uint32, sql string) {
96-
t.Name = loadString(mod, ptr+0, sql)
97-
t.Schema = loadString(mod, ptr+8, sql)
97+
t.Name = loadIdentifier(mod, ptr+0, sql)
98+
t.Schema = loadIdentifier(mod, ptr+8, sql)
9899
t.Comment = loadString(mod, ptr+16, sql)
99100

100101
t.IsTemporary = loadBool(mod, ptr+24)
@@ -115,8 +116,8 @@ func (t *Table) load(mod api.Module, ptr uint32, sql string) {
115116
})
116117

117118
t.Type = loadEnum[StatementType](mod, ptr+44)
118-
t.CurrentName = loadString(mod, ptr+48, sql)
119-
t.NewName = loadString(mod, ptr+56, sql)
119+
t.CurrentName = loadIdentifier(mod, ptr+48, sql)
120+
t.NewName = loadIdentifier(mod, ptr+56, sql)
120121
}
121122

122123
// Column holds metadata about a column.
@@ -143,10 +144,10 @@ type Column struct {
143144
}
144145

145146
func (c *Column) load(mod api.Module, ptr uint32, sql string) {
146-
c.Name = loadString(mod, ptr+0, sql)
147+
c.Name = loadIdentifier(mod, ptr+0, sql)
147148
c.Type = loadString(mod, ptr+8, sql)
148149
c.Length = loadString(mod, ptr+16, sql)
149-
c.ConstraintName = loadString(mod, ptr+24, sql)
150+
c.ConstraintName = loadIdentifier(mod, ptr+24, sql)
150151
c.Comment = loadString(mod, ptr+32, sql)
151152

152153
c.IsPrimaryKey = loadBool(mod, ptr+40)
@@ -161,7 +162,7 @@ func (c *Column) load(mod api.Module, ptr uint32, sql string) {
161162

162163
c.CheckExpr = loadString(mod, ptr+60, sql)
163164
c.DefaultExpr = loadString(mod, ptr+68, sql)
164-
c.CollateName = loadString(mod, ptr+76, sql)
165+
c.CollateName = loadIdentifier(mod, ptr+76, sql)
165166

166167
if ptr, _ := mod.Memory().ReadUint32Le(ptr + 84); ptr != 0 {
167168
c.ForeignKeyClause = &ForeignKey{}
@@ -181,15 +182,15 @@ type TableConstraint struct {
181182
ConflictClause ConflictClause
182183
IsAutoIncrement bool
183184
// Type is TABLECONSTRAINT_CHECK
184-
Expr string
185+
CheckExpr string
185186
// Type is TABLECONSTRAINT_FOREIGNKEY
186187
ForeignKeyNames []string
187188
ForeignKeyClause *ForeignKey
188189
}
189190

190191
func (c *TableConstraint) load(mod api.Module, ptr uint32, sql string) {
191192
c.Type = loadEnum[ConstraintType](mod, ptr+0)
192-
c.Name = loadString(mod, ptr+4, sql)
193+
c.Name = loadIdentifier(mod, ptr+4, sql)
193194
switch c.Type {
194195
case TABLECONSTRAINT_PRIMARYKEY, TABLECONSTRAINT_UNIQUE:
195196
c.IndexedColumns = loadSlice(mod, ptr+12, func(ptr uint32, ret *IdxColumn) uint32 {
@@ -199,10 +200,10 @@ func (c *TableConstraint) load(mod api.Module, ptr uint32, sql string) {
199200
c.ConflictClause = loadEnum[ConflictClause](mod, ptr+20)
200201
c.IsAutoIncrement = loadBool(mod, ptr+24)
201202
case TABLECONSTRAINT_CHECK:
202-
c.Expr = loadString(mod, ptr+12, sql)
203+
c.CheckExpr = loadString(mod, ptr+12, sql)
203204
case TABLECONSTRAINT_FOREIGNKEY:
204205
c.ForeignKeyNames = loadSlice(mod, ptr+12, func(ptr uint32, ret *string) uint32 {
205-
*ret = loadString(mod, ptr, sql)
206+
*ret = loadIdentifier(mod, ptr, sql)
206207
return 8
207208
})
208209
if ptr, _ := mod.Memory().ReadUint32Le(ptr + 20); ptr != 0 {
@@ -214,25 +215,25 @@ func (c *TableConstraint) load(mod api.Module, ptr uint32, sql string) {
214215

215216
// ForeignKey holds metadata about a foreign key constraint.
216217
type ForeignKey struct {
217-
Table string
218-
Columns []string
219-
OnDelete FKAction
220-
OnUpdate FKAction
221-
Match string
222-
Deferrable FKDefType
218+
Table string
219+
ColumnNames []string
220+
OnDelete FKAction
221+
OnUpdate FKAction
222+
Match string
223+
Deferrable FKDefType
223224
}
224225

225226
func (f *ForeignKey) load(mod api.Module, ptr uint32, sql string) {
226-
f.Table = loadString(mod, ptr+0, sql)
227+
f.Table = loadIdentifier(mod, ptr+0, sql)
227228

228-
f.Columns = loadSlice(mod, ptr+8, func(ptr uint32, ret *string) uint32 {
229-
*ret = loadString(mod, ptr, sql)
229+
f.ColumnNames = loadSlice(mod, ptr+8, func(ptr uint32, ret *string) uint32 {
230+
*ret = loadIdentifier(mod, ptr, sql)
230231
return 8
231232
})
232233

233234
f.OnDelete = loadEnum[FKAction](mod, ptr+16)
234235
f.OnUpdate = loadEnum[FKAction](mod, ptr+20)
235-
f.Match = loadString(mod, ptr+24, sql)
236+
f.Match = loadIdentifier(mod, ptr+24, sql)
236237
f.Deferrable = loadEnum[FKDefType](mod, ptr+32)
237238
}
238239

@@ -244,8 +245,8 @@ type IdxColumn struct {
244245
}
245246

246247
func (c *IdxColumn) load(mod api.Module, ptr uint32, sql string) {
247-
c.Name = loadString(mod, ptr+0, sql)
248-
c.CollateName = loadString(mod, ptr+8, sql)
248+
c.Name = loadIdentifier(mod, ptr+0, sql)
249+
c.CollateName = loadIdentifier(mod, ptr+8, sql)
249250
c.Order = loadEnum[OrderClause](mod, ptr+16)
250251
}
251252

@@ -258,6 +259,27 @@ func loadString(mod api.Module, ptr uint32, sql string) string {
258259
return sql[off-sqlp : off+len-sqlp]
259260
}
260261

262+
func loadIdentifier(mod api.Module, ptr uint32, sql string) string {
263+
off, _ := mod.Memory().ReadUint32Le(ptr + 0)
264+
if off == 0 {
265+
return ""
266+
}
267+
var old, new string
268+
len, _ := mod.Memory().ReadUint32Le(ptr + 4)
269+
str := sql[off-sqlp : off+len-sqlp]
270+
switch sql[off-sqlp-1] {
271+
default:
272+
return str
273+
case '`':
274+
old, new = "``", "`"
275+
case '"':
276+
old, new = `""`, `"`
277+
case '\'':
278+
old, new = `''`, `'`
279+
}
280+
return strings.ReplaceAll(str, old, new)
281+
}
282+
261283
func loadSlice[T any](mod api.Module, ptr uint32, fn func(uint32, *T) uint32) []T {
262284
ref, _ := mod.Memory().ReadUint32Le(ptr + 4)
263285
if ref == 0 {

‎util/sql3util/parse_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
func TestParse_references(t *testing.T) {
10-
tab, err := sql3util.ParseTable(`CREATE TABLE child(x REFERENCES parent)`)
10+
tab, err := sql3util.ParseTable("CREATE TABLE child(`x` INT REFERENCES parent)")
1111
if err != nil {
1212
t.Fatal(err)
1313
}
@@ -23,6 +23,9 @@ func TestParse_references(t *testing.T) {
2323
if got := col.Name; got != "x" {
2424
t.Errorf("got %s, want x", got)
2525
}
26+
if got := col.Type; got != "INT" {
27+
t.Errorf("got %s, want INT", got)
28+
}
2629

2730
fk := col.ForeignKeyClause
2831
if got := fk.Table; got != "parent" {
@@ -31,7 +34,7 @@ func TestParse_references(t *testing.T) {
3134
}
3235

3336
func TestParse_constraint(t *testing.T) {
34-
tab, err := sql3util.ParseTable(`CREATE TABLE child(x, y, PRIMARY KEY(x, y))`)
37+
tab, err := sql3util.ParseTable(`CREATE TABLE child('x', 'y', PRIMARY KEY('x', 'y'))`)
3538
if err != nil {
3639
t.Fatal(err)
3740
}
@@ -68,7 +71,7 @@ func TestParse_constraint(t *testing.T) {
6871
}
6972

7073
func TestParse_foreign(t *testing.T) {
71-
tab, err := sql3util.ParseTable(`CREATE TABLE child(x, y, FOREIGN KEY (x, y) REFERENCES parent)`)
74+
tab, err := sql3util.ParseTable(`CREATE TABLE child(x, y, FOREIGN KEY (x, y) REFERENCES "parent")`)
7275
if err != nil {
7376
t.Fatal(err)
7477
}

0 commit comments

Comments
 (0)