More sqlite-createtable-parser.

Author: ncruces

internal/util/page.go

@@ -0,0 +1,5 @@
+package util
+
+func ValidPageSize(s int) bool {
+	return s&(s-1) == 0 && 512 <= s && s <= 65536
+}

util/sql3util/arg.go internal/util/parse.goutil/sql3util/arg.go renamed to internal/util/parse.go

@@ -1,54 +1,11 @@
-package sql3util
+package util
 
 import (
 	"strconv"
 	"strings"
 	"time"
 )
 
-// NamedArg splits an named arg into a key and value,
-// around an equals sign.
-// Spaces are trimmed around both key and value.
-func NamedArg(arg string) (key, val string) {
-	key, val, _ = strings.Cut(arg, "=")
-	key = strings.TrimSpace(key)
-	val = strings.TrimSpace(val)
-	return
-}
-
-// Unquote unquotes a string.
-//
-// https://sqlite.org/lang_keywords.html
-func Unquote(val string) string {
-	if len(val) < 2 {
-		return val
-	}
-	fst := val[0]
-	lst := val[len(val)-1]
-	rst := val[1 : len(val)-1]
-	if fst == '[' && lst == ']' {
-		return rst
-	}
-	if fst != lst {
-		return val
-	}
-	var old, new string
-	switch fst {
-	default:
-		return val
-	case '`':
-		old, new = "``", "`"
-	case '"':
-		old, new = `""`, `"`
-	case '\'':
-		old, new = `''`, `'`
-	}
-	return strings.ReplaceAll(rst, old, new)
-}
-
-// ParseBool parses a boolean.
-//
-// https://sqlite.org/pragma.html#syntax
 func ParseBool(s string) (b, ok bool) {
 	if len(s) == 0 {
 		return false, false
@@ -68,7 +25,6 @@ func ParseBool(s string) (b, ok bool) {
 	return false, false
 }
 
-// ParseFloat parses a decimal floating point number.
 func ParseFloat(s string) (f float64, ok bool) {
 	if strings.TrimLeft(s, "+-.0123456789Ee") != "" {
 		return
@@ -77,10 +33,6 @@ func ParseFloat(s string) (f float64, ok bool) {
 	return f, err == nil
 }
 
-// ParseTimeShift parses a time shift modifier,
-// also the output of timediff.
-//
-// https://sqlite.org/lang_datefunc.html
 func ParseTimeShift(s string) (years, months, days int, duration time.Duration, ok bool) {
 	// Sign part: ±
 	neg := strings.HasPrefix(s, "-")

util/sql3util/arg_test.go internal/util/parse_test.goutil/sql3util/arg_test.go renamed to internal/util/parse_test.go

@@ -1,37 +1,14 @@
-package sql3util_test
+package util_test
 
 import (
 	"testing"
 	"time"
 
 	"github.com/ncruces/go-sqlite3"
 	_ "github.com/ncruces/go-sqlite3/embed"
-	"github.com/ncruces/go-sqlite3/util/sql3util"
+	"github.com/ncruces/go-sqlite3/internal/util"
 )
 
-func TestUnquote(t *testing.T) {
-	tests := []struct {
-		val  string
-		want string
-	}{
-		{"a", "a"},
-		{"abc", "abc"},
-		{"abba", "abba"},
-		{"`ab``c`", "ab`c"},
-		{"'ab''c'", "ab'c"},
-		{"'ab``c'", "ab``c"},
-		{"[ab``c]", "ab``c"},
-		{`"ab""c"`, `ab"c`},
-	}
-	for _, tt := range tests {
-		t.Run(tt.val, func(t *testing.T) {
-			if got := sql3util.Unquote(tt.val); got != tt.want {
-				t.Errorf("Unquote(%s) = %s, want %s", tt.val, got, tt.want)
-			}
-		})
-	}
-}
-
 func TestParseBool(t *testing.T) {
 	tests := []struct {
 		str string
@@ -49,7 +26,7 @@ func TestParseBool(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.str, func(t *testing.T) {
-			gotVal, gotOK := sql3util.ParseBool(tt.str)
+			gotVal, gotOK := util.ParseBool(tt.str)
 			if gotVal != tt.val || gotOK != tt.ok {
 				t.Errorf("ParseBool(%q) = (%v, %v) want (%v, %v)", tt.str, gotVal, gotOK, tt.val, tt.ok)
 			}
@@ -88,7 +65,7 @@ func TestParseTimeShift(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.str, func(t *testing.T) {
-			years, months, days, duration, gotOK := sql3util.ParseTimeShift(tt.str)
+			years, months, days, duration, gotOK := util.ParseTimeShift(tt.str)
 			gotVal := epoch.AddDate(years, months, days).Add(duration)
 			if !gotVal.Equal(tt.val) || gotOK != tt.ok {
 				t.Errorf("ParseTimeShift(%q) = (%v, %v) want (%v, %v)", tt.str, gotVal, gotOK, tt.val, tt.ok)
@@ -136,7 +113,7 @@ func FuzzParseTimeShift(f *testing.F) {
 	epoch := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)
 
 	f.Fuzz(func(t *testing.T, str string) {
-		years, months, days, duration, ok := sql3util.ParseTimeShift(str)
+		years, months, days, duration, ok := util.ParseTimeShift(str)
 
 		// Account for a full 400 year cycle.
 		if years < -200 || years > +200 {

time.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/ncruces/go-sqlite3/internal/util"
-	"github.com/ncruces/go-sqlite3/util/sql3util"
 	"github.com/ncruces/julianday"
 )
 
@@ -160,7 +159,7 @@ func (f TimeFormat) Decode(v any) (time.Time, error) {
 		if s, ok := v.(string); ok {
 			if i, err := strconv.ParseInt(s, 10, 64); err == nil {
 				v = i
-			} else if f, ok := sql3util.ParseFloat(s); ok {
+			} else if f, ok := util.ParseFloat(s); ok {
 				v = f
 			} else {
 				return time.Time{}, util.TimeErr
@@ -237,7 +236,7 @@ func (f TimeFormat) Decode(v any) (time.Time, error) {
 				v = i
 				break
 			}
-			f, ok := sql3util.ParseFloat(s)
+			f, ok := util.ParseFloat(s)
 			if ok {
 				v = f
 				break

util/sql3util/const.go

@@ -49,6 +49,15 @@ const (
 	DEFTYPE_NOTDEFERRABLE_INITIALLY_IMMEDIATE
 )
 
+type ConstraintType uint32
+
+const (
+	TABLECONSTRAINT_PRIMARYKEY ConstraintType = iota
+	TABLECONSTRAINT_UNIQUE
+	TABLECONSTRAINT_CHECK
+	TABLECONSTRAINT_FOREIGNKEY
+)
+
 type StatementType uint32
 
 const (

util/sql3util/parse.go

@@ -8,6 +8,7 @@ import (
 	"github.com/tetratelabs/wazero"
 	"github.com/tetratelabs/wazero/api"
 
+	"github.com/ncruces/go-sqlite3"
 	"github.com/ncruces/go-sqlite3/internal/util"
 )
 
@@ -29,6 +30,10 @@ var (
 // [CREATE]: https://sqlite.org/lang_createtable.html
 // [ALTER TABLE]: https://sqlite.org/lang_altertable.html
 func ParseTable(sql string) (_ *Table, err error) {
+	if len(sql) > 8192 {
+		return nil, sqlite3.TOOBIG
+	}
+
 	once.Do(func() {
 		ctx := context.Background()
 		cfg := wazero.NewRuntimeConfigInterpreter()
@@ -81,6 +86,7 @@ type Table struct {
 	IsWithoutRowID bool
 	IsStrict       bool
 	Columns        []Column
+	Constraints    []TableConstraint
 	Type           StatementType
 	CurrentName    string
 	NewName        string
@@ -96,9 +102,16 @@ func (t *Table) load(mod api.Module, ptr uint32, sql string) {
 	t.IsWithoutRowID = loadBool(mod, ptr+26)
 	t.IsStrict = loadBool(mod, ptr+27)
 
-	t.Columns = loadSlice(mod, ptr+28, func(ptr uint32, ret *Column) {
+	t.Columns = loadSlice(mod, ptr+28, func(ptr uint32, ret *Column) uint32 {
+		p, _ := mod.Memory().ReadUint32Le(ptr)
+		ret.load(mod, p, sql)
+		return 4
+	})
+
+	t.Constraints = loadSlice(mod, ptr+36, func(ptr uint32, ret *TableConstraint) uint32 {
 		p, _ := mod.Memory().ReadUint32Le(ptr)
 		ret.load(mod, p, sql)
+		return 4
 	})
 
 	t.Type = loadEnum[StatementType](mod, ptr+44)
@@ -159,6 +172,47 @@ func (c *Column) load(mod api.Module, ptr uint32, sql string) {
 	c.GeneratedType = loadEnum[GenType](mod, ptr+96)
 }
 
+// TableConstraint holds metadata about a table key constraint.
+type TableConstraint struct {
+	Type ConstraintType
+	Name string
+	// Type is TABLECONSTRAINT_PRIMARYKEY or TABLECONSTRAINT_UNIQUE
+	IndexedColumns  []IdxColumn
+	ConflictClause  ConflictClause
+	IsAutoIncrement bool
+	// Type is TABLECONSTRAINT_CHECK
+	Expr string
+	// Type is TABLECONSTRAINT_FOREIGNKEY
+	ForeignKeyNames  []string
+	ForeignKeyClause *ForeignKey
+}
+
+func (c *TableConstraint) load(mod api.Module, ptr uint32, sql string) {
+	c.Type = loadEnum[ConstraintType](mod, ptr+0)
+	c.Name = loadString(mod, ptr+4, sql)
+	switch c.Type {
+	case TABLECONSTRAINT_PRIMARYKEY, TABLECONSTRAINT_UNIQUE:
+		c.IndexedColumns = loadSlice(mod, ptr+12, func(ptr uint32, ret *IdxColumn) uint32 {
+			ret.load(mod, ptr, sql)
+			return 20
+		})
+		c.ConflictClause = loadEnum[ConflictClause](mod, ptr+20)
+		c.IsAutoIncrement = loadBool(mod, ptr+24)
+	case TABLECONSTRAINT_CHECK:
+		c.Expr = loadString(mod, ptr+12, sql)
+	case TABLECONSTRAINT_FOREIGNKEY:
+		c.ForeignKeyNames = loadSlice(mod, ptr+12, func(ptr uint32, ret *string) uint32 {
+			*ret = loadString(mod, ptr, sql)
+			return 8
+		})
+		if ptr, _ := mod.Memory().ReadUint32Le(ptr + 20); ptr != 0 {
+			c.ForeignKeyClause = &ForeignKey{}
+			c.ForeignKeyClause.load(mod, ptr, sql)
+		}
+	}
+}
+
+// ForeignKey holds metadata about a foreign key constraint.
 type ForeignKey struct {
 	Table      string
 	Columns    []string
@@ -171,8 +225,9 @@ type ForeignKey struct {
 func (f *ForeignKey) load(mod api.Module, ptr uint32, sql string) {
 	f.Table = loadString(mod, ptr+0, sql)
 
-	f.Columns = loadSlice(mod, ptr+8, func(ptr uint32, ret *string) {
+	f.Columns = loadSlice(mod, ptr+8, func(ptr uint32, ret *string) uint32 {
 		*ret = loadString(mod, ptr, sql)
+		return 8
 	})
 
 	f.OnDelete = loadEnum[FKAction](mod, ptr+16)
@@ -181,6 +236,19 @@ func (f *ForeignKey) load(mod api.Module, ptr uint32, sql string) {
 	f.Deferrable = loadEnum[FKDefType](mod, ptr+32)
 }
 
+// IdxColumn holds metadata about an indexed column.
+type IdxColumn struct {
+	Name        string
+	CollateName string
+	Order       OrderClause
+}
+
+func (c *IdxColumn) load(mod api.Module, ptr uint32, sql string) {
+	c.Name = loadString(mod, ptr+0, sql)
+	c.CollateName = loadString(mod, ptr+8, sql)
+	c.Order = loadEnum[OrderClause](mod, ptr+16)
+}
+
 func loadString(mod api.Module, ptr uint32, sql string) string {
 	off, _ := mod.Memory().ReadUint32Le(ptr + 0)
 	if off == 0 {
@@ -190,16 +258,15 @@ func loadString(mod api.Module, ptr uint32, sql string) string {
 	return sql[off-sqlp : off+len-sqlp]
 }
 
-func loadSlice[T any](mod api.Module, ptr uint32, fn func(uint32, *T)) []T {
+func loadSlice[T any](mod api.Module, ptr uint32, fn func(uint32, *T) uint32) []T {
 	ref, _ := mod.Memory().ReadUint32Le(ptr + 4)
 	if ref == 0 {
 		return nil
 	}
 	len, _ := mod.Memory().ReadUint32Le(ptr + 0)
 	ret := make([]T, len)
 	for i := range ret {
-		fn(ref, &ret[i])
-		ref += 4
+		ref += fn(ref, &ret[i])
 	}
 	return ret
 }