@@ -3,6 +3,7 @@ package sql3util
33import (
44 "context"
55 _ "embed"
6+ "strings"
67 "sync"
78
89 "github.com/tetratelabs/wazero"
@@ -93,8 +94,8 @@ type Table struct {
9394}
9495
9596func (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
145146func (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
190191func (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.
216217type 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
225226func (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
246247func (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+
261283func 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 {
0 commit comments