Fixes.

ncruces · Jun 19, 2024 · e226609 · e226609
1 parent 5c1c0f0
commit e226609
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/ext/bloom/bloom.go b/ext/bloom/bloom.go
@@ -87,6 +87,9 @@ func create(db *sqlite3.Conn, _, schema, table string, arg ...string) (_ *bloom,
 		return nil, err
 	}
 
+	id := db.LastInsertRowID()
+	defer db.SetLastInsertRowID(id)
+
 	err = db.Exec(fmt.Sprintf(
 		`INSERT INTO %s.%s (rowid, data, p, n, m, k)
 		 VALUES (1, zeroblob(%d), %f, %d, %d, %d)`,
@@ -163,13 +166,14 @@ func (b *bloom) BestIndex(idx *sqlite3.IndexInfo) error {
 		if cst.Usable && cst.Column == 1 &&
 			cst.Op == sqlite3.INDEX_CONSTRAINT_EQ {
 			idx.ConstraintUsage[n].ArgvIndex = 1
+			idx.OrderByConsumed = true
+			idx.EstimatedRows = 1
+			idx.EstimatedCost = float64(b.hashes)
+			idx.IdxFlags = sqlite3.INDEX_SCAN_UNIQUE
+			return nil
 		}
 	}
-	idx.OrderByConsumed = true
-	idx.EstimatedRows = 1
-	idx.EstimatedCost = float64(b.hashes)
-	idx.IdxFlags = sqlite3.INDEX_SCAN_UNIQUE
-	return nil
+	return sqlite3.CONSTRAINT
 }
 
 func (b *bloom) Update(arg ...sqlite3.Value) (rowid int64, err error) {

diff --git a/ext/csv/csv.go b/ext/csv/csv.go
@@ -96,7 +96,11 @@ func RegisterFS(db *sqlite3.Conn, fsys fs.FS) {
 			}
 			schema = getSchema(header, columns, row)
 		} else {
-			table.typs = getColumnAffinities(schema)
+			defer func() {
+				if err == nil {
+					table.typs, err = getColumnAffinities(schema)
+				}
+			}()
 		}
 
 		err = db.DeclareVTab(schema)

diff --git a/ext/csv/types.go b/ext/csv/types.go
@@ -17,10 +17,10 @@ const (
 	real    affinity = 4
 )
 
-func getColumnAffinities(schema string) []affinity {
+func getColumnAffinities(schema string) ([]affinity, error) {
 	tab, err := vtabutil.Parse(schema)
 	if err != nil {
-		return nil
+		return nil, err
 	}
 	defer tab.Close()
 
@@ -29,7 +29,7 @@ func getColumnAffinities(schema string) []affinity {
 		col := tab.Column(i)
 		types[i] = getAffinity(col.Type())
 	}
-	return types
+	return types, nil
 }
 
 func getAffinity(declType string) affinity {

diff --git a/util/vtabutil/parse.go b/util/vtabutil/parse.go
@@ -12,6 +12,11 @@ import (
 )
 
 const (
+	_NONE = iota
+	_MEMORY
+	_SYNTAX
+	_UNSUPPORTEDSQL
+
 	code = 4
 	base = 8
 )
@@ -56,11 +61,13 @@ func Parse(sql string) (*Table, error) {
 	}
 
 	c, _ := mod.Memory().ReadUint32Le(code)
-	if c == uint32(_MEMORY) {
+	switch c {
+	case _MEMORY:
 		panic(util.OOMErr)
-	}
-	if c != uint32(_NONE) {
-		return nil, ecode(c)
+	case _SYNTAX:
+		return nil, util.ErrorString("sql3parse: invalid syntax")
+	case _UNSUPPORTEDSQL:
+		return nil, util.ErrorString("sql3parse: unsupported SQL")
 	}
 	if r[0] == 0 {
 		return nil, nil
@@ -123,23 +130,3 @@ func (c Column) Type() string {
 	len, _ := c.tab.mod.Memory().ReadUint32Le(uint32(r[0]) + 4)
 	return c.tab.sql[off-base : off+len-base]
 }
-
-type ecode uint32
-
-const (
-	_NONE ecode = iota
-	_MEMORY
-	_SYNTAX
-	_UNSUPPORTEDSQL
-)
-
-func (e ecode) Error() string {
-	switch e {
-	case _SYNTAX:
-		return "sql3parse: invalid syntax"
-	case _UNSUPPORTEDSQL:
-		return "sql3parse: unsupported SQL"
-	default:
-		panic(util.AssertErr())
-	}
-}